Fixed problem with proxy server sometimes responds with 400 Bad Request when trying
to connect to a site using https.

The CONNECT to the server lacks the 'host' header which is mandatory according to the
specification. Some proxy servers are strictly following the specification and sends
back the 400 Bad Requst error code.
checkpoint animations

Change-Id: I14ef05bf56470565e4b0cb706f9fb358cdcb42ff
Bluetooth:LCD wakeup during remote BT pairing request.
This change fixes the issue of LCD not coming up during remote
initiated pairing request when android is in suspend

Change-Id: I658954857584ae1a4737261b1ae1749f4d0a7998
Signed-off-by: Bheemsen Kulkarni <x0099674@ti.com>
Preflight before attempting to start network location and geocoder services

Signed-off-by: Mike Lockwood <lockwood@android.com>

Conflicts:
	services/java/com/android/server/LocationManagerService.java
Seperate out Mutex and Signal code into reusable classes.

Change-Id: I381d09d89b567d433a10a91e0d7e59c24d3444d8

Conflicts:
	libs/rs/rsContext.cpp
	libs/rs/rsLocklessFifo.cpp
Checkin new types for RS.

Change-Id: I3d7a1a91c45cc1c97c60f3615f32e54e98e12f91
Update Script java classes and llvm samples.

Change-Id: I05c8d63fcca095d4fea6abb1ff5736ab9d78a3e6
Use the content width to calculate the zoom overview
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.

By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.

Fix http://b/issue?id=2551119
Add a test program for Sapphire viewport
rotation issue.
Give all PreferenceActivity subclasses ability to be launched in wizard mode with Back/Next buttons

Change-Id: Ifc8c22c70e808629a9a889406f17a962615e2574

Conflicts:
	core/res/res/values/strings.xml
Enable nested bidi levels in a paragraph.

Changes the internal representation of direction information in the Directions object to be a visually-ordered list of start/length+direction pairs instead of a list of directionality inversion offsets.

Rewrite Layout.getOffsetToLeft/RightOf to use run information instead of width metrics.

Remove java Bidi, use native.  Switch bidi tests to test native, expect levels instead of dirs.

Add test of directionality.  Leave in switch to turn new code off and restore previous behavior for now.

Change-Id: Iea8bb46c678a18820e237c90f76007a084c83051
Don't measure for a secondary caret unless we have one.

Also, clean up imports and trailing whitespace.

Change-Id: I5ebaaceb756600a1ca7370ab3ef078ce200545ef
Add isSilentMode initially hidden before API council approval, test case to be added separately.

Change-Id: Id9384a2caf45b8775705cde6c990c3c65c7c6312
sdk doc change: clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.

Change-Id: I07f6858f78e3b48ccaa99e87d81d18bf0499bdc0

Conflicts:
	core/java/android/view/ViewGroup.java
Add an option to not register the ContentObserver when creating a CursorAdapter.

Change-Id: Ic18f0307f5ba0d54f7270d8d1e032feff537360b

Conflicts:
	api/current.xml
Fix 2566319, don't use package-protected members from Layout in test.

Change-Id: Ic3457e6857f03ba5550c5d82f22af2385a3c4b91
Add Overlay mode to the PorterDuff list of supported modes.

Change-Id: I2ec03b9a1039db3e3c16786222e4fde4782ed67e
ExpandableListView tests moved to CTS.

Tests were duplicates of those in CTS.

Change-Id: I70d7cb46e58bdbca6958467b9b2e650e7546292b
https://android-git.corp.google.com/g/#change,47984
http://b/issue?id=2541389

Conflicts:
	core/tests/coretests/src/android/widget/expandablelistview/ExpandableListWithHeadersTest.java
create a SyncManager WakeLock for each syncadapter
accountType/authority pair so that it will be easy to tell via
bugreport which sync adapter is holding the wake lock the most

http://b/issue?id=2571451

Conflicts:
	core/java/android/content/SyncManager.java
Refactor Styled utility functions into reusable objects.

This takes utility functions from Styled and a few other classes and
incorporates them into two new utility classes, TextLine and
MeasuredText.  The main point of this is to support shaping by skia,
to experiment with how this will look, this also introduces
character-based Arabic shaping.

MeasuredText is used by code that determines line breaks by generating
and examining character widths in logical order.  Factoring the code
in this way makes it usable by the ellipsize functions in TextUtils as
well as by StaticLayout.  This class takes over the caching of widths
and chars arrays that was previously performed by StyledText.  A small
number of MeasuredText objects are themselves cached by the class and
accesed using static obtain and recycle methods.  Generally only these
few cached instances are ever created.

TextLine is used by code that draws or measures text on a line.  This
unifies the line measuring and rendering code, and pushes assumptions
about how rtl text is treated closer to the points where skia code is
invoked.  TextLine implements the functions that were previously
provided by Styled, working on member arrays rather than
explicitly-passed arguments.  It implements the same kind of static
cache as MeasuredText.

TextLine and MeasureText simulate arabic glyph generation and shaping
by using ArabicShaping, ported with very minor changes from ICU4J's
ArabicShaping.  This class generates shaped Arabic glyphs and Lam-Alef
ligatures using Unicode presentation forms.  ArabicShaping is not
intended to be permanent, but to be replaced by real shaping from the
skia layer. It is introduced in order to emulate the behavior of real
shaping so that higher level code dealing with rendering shaped text
and cursor movement over ligatures can be developed and tested; it
also provides basic-level support for Arabic.

Since cursor movement depends on conjuncts whose formation is
font-dependent, cursor movement code that was formerly in Layout and
StaticLayout was moved into TextLine so that it can work on the shaped
text.

Other than these changes, the other major change is a rework of the
ellipsize utility functions to combine multiple branches into fewer
branches with additional state.

Updated copyright notices on new files.

Change-Id: I492cb58b51f5aaf6f14cb1419bdbed49eac5ba29

Conflicts:
	core/java/android/text/TextUtils.java