Merge commit '9edc4e8930273d9bb3b5e9cb73c219e012de8ffb'
* commit '9edc4e8930273d9bb3b5e9cb73c219e012de8ffb':
GestureOverlayView was not invalidating itself when calling clear(false). Calling clear(true) was working properly. This change also makes clear(false) and clear(true) both behave similarly when fireActionPerformed == true.
Merge commit 'e7c36dda7ada30e02f3aa9d75f282a53402aeae7'
* commit 'e7c36dda7ada30e02f3aa9d75f282a53402aeae7':
Add new orientation attribute to GestureOverlayView. This can be used to prevent the overlay from interfering with vertically/horizontally scrolling views underneath the overlay.
Merge commit 'ec25df9fbc685be384f8dd764fa224a4d923e9d8'
* commit 'ec25df9fbc685be384f8dd764fa224a4d923e9d8':
Fix drawing bug: opaque invalidations should not be taken into account when the invalidated view is animating. Also add the ability to disable the auto-fade on the GestureOverlayView.
Merge commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2'
* commit 'ff686ce11e952a9001b1384d8e7d82127b0529a2':
Change when gestures listeners are fired.
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
Merge commit '82392e84b9bcf618d1c41730ec14fb8dab841990'
* commit '82392e84b9bcf618d1c41730ec14fb8dab841990':
Cleanup Gestures API and make it easier to use in 3rd party apps. Also fix the events processing in the gestures overlay mechanism. Give better control of the various properties of the overlay through XML attributes.
Merge commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd'
* commit 'd9a874a4cb8e82ae64c1698bd71ced8d87bbc5cd':
Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
* changes:
Fixes NPE in ListViews with non-selectable items. This was caused by a weird initialization issue in ListView and AbsListView: a private final field instanciated in the declaration in ListView was used in AbsListView<init> via an overriden method and that field was somehow null at this time. This fix moves the instanciation at a later point.
Merge commit '270e87f71abc2edf446dbec20c725c823e8c7f37'
* commit '270e87f71abc2edf446dbec20c725c823e8c7f37':
Sensors: Use a native_handle for the data channel instead of a single file descriptor.
This eliminates the requirement that all sensors share a single file descriptor.
This, along with concurrent changes in other projects, fixes bugs b/1614524 and b/1614481
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6'
* commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6':
Change the media key algorithm to also ignore double quotes.
Merge commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3'
* commit 'd50a458bb291801ab9fdc119301bc7b84b42a6e3':
Fix a major bug in Bundle when unparcelling from AIDL.
Merge commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca'
* commit '4e1afc1a569d05cc6a1ee213c65ffb49513600ca':
Fixes#1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
* changes:
Fixes#1872506. Prevents NPE in ListView. When the opaque property changes at runtime, it is possible to end up in a situation in which the divider's Paint instance has not been instanciated. This change simples uses a final Paint that is guaranteed to not be null.
This adds the PowerProfile class and data file that provides power consumption numbers
for different subsystems. Also added Audio/Video subsystems to track on a per UID basis.
There was a serious problem in the Bundle(Parcel) and readFromParcel() methods,
where it wasn't doing the copying of the Parcel that Parcel.readBundle() does
and is a basic requirement for it to work correctly.
This re-arranges the code to make all of these functions (hopefully) correct.
Also fix a problem in Parcel where we were not duping fds when copying data from
one Parcel to another.
Merge commit '36e862a699aa2a23df1543665f39b5b0c96885fb'
* commit '36e862a699aa2a23df1543665f39b5b0c96885fb':
Fixed vertical text position in search suggestion items.
Background:
mlebeau said: "Cole had complained that the vertical alignment of the
text fields in search_dropdown_item_icons_2line.xml was a little
off. Specifically, when both lines are visible he wanted to see line1
pushed down 2-4 pixels (while keeping line2 in the same position as
now), and when only line1 is visible, he said it needed to be pushed
up 2-4 pixels from current."
Here's how the layout worked before (note that text2 and text1
are in this order in the layout file):
- If text2 is present, it is put at the bottom, with height set by
layout_height (currently 29dip) . - The line2 text is put at the top
of text2 (gravity=top).
- I think the paddingBottom=4dip in text2 has no effect, since the
text is top-aligned anyway.
- text1 is put at the top of the list item. If text2 is present, it
will have height 29dip (58 dip - 29 dip height of text2). It's a bit
weird, layout_height of text1 is completely ignored, but it has to be
set to something. If text2 is missing, it will fill the entire list
item height (58 dip).
- The line1 text is placed 4dip below the vertical center of text1
(4dip because of paddingTop).
Now, instead, text1 has height=wrap_content, and is placed right above
text2, if that's present. If text2 is absent, text1 is centered
vertically in the list item. This should have the desired effect.
If we want to tweak the positioning further in the case where text2
is visible, we can adjust the padding of text1.
* changes:
Add a new API to ListView: setGestures(int). This allows developers to enable gestures to jump inside the list or filter it. This change also introduces a new XML attribute to control this API. It also adds the ability to theme the GestureOverlayView from the gestures library. Finally, this adds a new VERSION header to the binary format used to store the letters for the recognizer.
Merge commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7'
* commit 'cfcc0df2658d0ce7dc753511bb44ab8ae7a636f7':
Move the Gestures API to the framework in android.gesture.
