OSDN Git Service
Isaac Katzenelson [Wed, 28 Aug 2013 23:54:02 +0000 (16:54 -0700)]
am
18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit '
18f590a9b7d2690e5f4189d8d0c025ff1a5bf199':
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
Isaac Katzenelson [Wed, 28 Aug 2013 23:49:41 +0000 (23:49 +0000)]
Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
Sandeep Siddhartha [Wed, 28 Aug 2013 23:43:41 +0000 (16:43 -0700)]
am
bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev
* commit '
bd31a483d358b02e4a16949b576560d4e0672ea3':
Tweak the HotwordRecognizer API
Sandeep Siddhartha [Wed, 28 Aug 2013 23:38:53 +0000 (23:38 +0000)]
Merge "Tweak the HotwordRecognizer API" into klp-dev
Sandeep Siddhartha [Tue, 27 Aug 2013 20:09:41 +0000 (13:09 -0700)]
Tweak the HotwordRecognizer API
- Make it more intuitive by enforcing callers to set a listener while
starting recognition
- Fix TODO to resolve the ComponentName if none is provided
- Unbind from the Hotword service if stopRecognition is called
- Get rid of the callback in onStopHotwordRecognition
Change-Id: I8edad0ef0f3671283aeb51eaed1d3b8dab01baa0
Mindy Pereira [Wed, 28 Aug 2013 23:10:36 +0000 (16:10 -0700)]
am
dd9b079c: Merge "Fix case when user touches the very edge of a view" into klp-dev
* commit '
dd9b079cdf57f13f38d2700f05650fd04d4009d6':
Fix case when user touches the very edge of a view
Mindy Pereira [Wed, 28 Aug 2013 23:08:53 +0000 (23:08 +0000)]
Merge "Fix case when user touches the very edge of a view" into klp-dev
Mindy Pereira [Wed, 28 Aug 2013 22:00:14 +0000 (15:00 -0700)]
Fix case when user touches the very edge of a view
This now counts touches at the exact top edge of the view as valid
Change-Id: I9e81a7001632c38d567dde40954e079e7145fa36
Fabrice Di Meglio [Wed, 28 Aug 2013 19:57:03 +0000 (12:57 -0700)]
am
627dd9b5: Merge "Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
* commit '
627dd9b584a267b206bace8dc518287fe58b9563':
Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
Fabrice Di Meglio [Wed, 28 Aug 2013 19:53:56 +0000 (19:53 +0000)]
Merge "Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data" into klp-dev
John Spurlock [Wed, 28 Aug 2013 19:34:02 +0000 (12:34 -0700)]
am
f016a912: Merge "Ensure IME windows always appear north of the nav bar." into klp-dev
* commit '
f016a91247d591fd77e82383a84ae41606e30edd':
Ensure IME windows always appear north of the nav bar.
John Spurlock [Wed, 28 Aug 2013 19:32:05 +0000 (19:32 +0000)]
Merge "Ensure IME windows always appear north of the nav bar." into klp-dev
Dirk Dougherty [Wed, 28 Aug 2013 18:51:30 +0000 (11:51 -0700)]
am
f503fbd0: am
d4702f3c: am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
f503fbd0a2ec9fcd050ebfaebafcb8c2234caaab':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 18:46:48 +0000 (11:46 -0700)]
am
d4702f3c: am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
d4702f3c67473045d92eb4c3ea001d671f2f5f56':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 18:44:42 +0000 (11:44 -0700)]
am
6d3fbd00: am
8236443b: Doc change: update spam policy image.
* commit '
6d3fbd0073cdb9cd21acfb56b58a29634bd182ad':
Doc change: update spam policy image.
Sam Blitzstein [Wed, 28 Aug 2013 18:42:05 +0000 (11:42 -0700)]
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
As per UX, we're removing the EXTRA_DELETE_AFTER_USE flag. Instead,
apps that pick up these intents should automatically delete alarms
and timers, unless the user is taken into the app to explicicitly
specify the time/length.
Change-Id: Ibd582788c04e121427467f6549759c8b7706df8c
Dirk Dougherty [Wed, 28 Aug 2013 18:42:05 +0000 (11:42 -0700)]
am
8236443b: Doc change: update spam policy image.
* commit '
8236443bdac2ba7c7630ddcc4ce9a18a03fe31a1':
Doc change: update spam policy image.
Dirk Dougherty [Wed, 28 Aug 2013 17:43:36 +0000 (10:43 -0700)]
Doc change: update spam policy image.
Change-Id: Ib19ea838f0f72725cedf2cea8aff505ccc477a45
John Spurlock [Wed, 28 Aug 2013 18:17:09 +0000 (14:17 -0400)]
Ensure IME windows always appear north of the nav bar.
Even if the bars are transparent / invisible.
Refactor the PSB bar mode override logic to take the IME hint into
account. Bars are overriden to opaque when hint is showing.
Initialize bar state to showing, fix bug that would mark state
as hidden pre-show (on shell restart).
Bug:
10505132
Bug:
9499956
Change-Id: I21e830e90c7e9812b4192ca65c3c0cd7a6b72798
Alan Viverette [Wed, 28 Aug 2013 18:08:27 +0000 (11:08 -0700)]
am
236ae4f2: Merge "Set alpha channel correctly when recomputing gradient" into klp-dev
* commit '
236ae4f2c92bb6d17eb946b20f03155a7b8e1ac6':
Set alpha channel correctly when recomputing gradient
Alan Viverette [Wed, 28 Aug 2013 18:03:11 +0000 (18:03 +0000)]
Merge "Set alpha channel correctly when recomputing gradient" into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:49:44 +0000 (10:49 -0700)]
am
ce9e2526: Merge "Implement new accessibility APIs in lists, text view" into klp-dev
* commit '
ce9e2526d43159df931cc9c0ba7173960d8a6a06':
Implement new accessibility APIs in lists, text view
Santos Cordon [Wed, 28 Aug 2013 17:49:41 +0000 (10:49 -0700)]
am
b56ed3a4: Merge "Protecting against NPE with null country detector." into klp-dev
* commit '
b56ed3a4b2ad168b58356173e539f8112d351283':
Protecting against NPE with null country detector.
Alan Viverette [Wed, 28 Aug 2013 17:44:44 +0000 (17:44 +0000)]
Merge "Implement new accessibility APIs in lists, text view" into klp-dev
Santos Cordon [Wed, 28 Aug 2013 17:43:18 +0000 (17:43 +0000)]
Merge "Protecting against NPE with null country detector." into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:43:07 +0000 (10:43 -0700)]
Implement new accessibility APIs in lists, text view
Sets contentInvalid for TextViews with errors, sets collection
and item properties in AbsListView, GridView, and ListView.
BUG:
10391326
Change-Id: I91191c8ce1e10a1112f74215e30b26349396344b
Alan Viverette [Wed, 28 Aug 2013 17:27:24 +0000 (10:27 -0700)]
am
116c12ef: Merge "Add public API for obtaining drag-to-open listener" into klp-dev
* commit '
116c12ef4c5fc2d5e5e90a417c4386c1f9a3ddf6':
Add public API for obtaining drag-to-open listener
Alan Viverette [Wed, 28 Aug 2013 17:25:06 +0000 (17:25 +0000)]
Merge "Add public API for obtaining drag-to-open listener" into klp-dev
Alan Viverette [Wed, 28 Aug 2013 17:24:12 +0000 (10:24 -0700)]
Set alpha channel correctly when recomputing gradient
The alpha channel is applied by modulateAlpha(). Setting it to
mAlpha in ensureValidRect() locked the maximum alpha channel to
whatever value was set before layout. Setting it to BLACK
ensures it can be modulated later.
BUG:
10514848
Change-Id: If7a824410a66f1e9b648e20ee627bdf99a42ae78
Marco Nelissen [Wed, 28 Aug 2013 17:21:55 +0000 (10:21 -0700)]
am
ee9d4438: Merge "Use explicit intent for MediaScannerConnection" into klp-dev
* commit '
ee9d44384239fff3d61cd4dd27f9daefb8a7103a':
Use explicit intent for MediaScannerConnection
Marco Nelissen [Wed, 28 Aug 2013 17:19:47 +0000 (17:19 +0000)]
Merge "Use explicit intent for MediaScannerConnection" into klp-dev
Jason Monk [Wed, 28 Aug 2013 14:43:39 +0000 (07:43 -0700)]
am
1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev
* commit '
1f809c7761a52102621b22fe8ec8c9f91ec1fe54':
Don't clear Global Proxy on boot.
Jason Monk [Wed, 28 Aug 2013 14:41:15 +0000 (14:41 +0000)]
Merge "Don't clear Global Proxy on boot." into klp-dev
John Spurlock [Wed, 28 Aug 2013 13:28:23 +0000 (06:28 -0700)]
am
d20aeab0: Merge "SystemUI asset update post ux asset merge." into klp-dev
* commit '
d20aeab028bae53b46a707119e57a50c073337c2':
SystemUI asset update post ux asset merge.
John Spurlock [Wed, 28 Aug 2013 13:26:01 +0000 (13:26 +0000)]
Merge "SystemUI asset update post ux asset merge." into klp-dev
Daniel Sandler [Wed, 28 Aug 2013 13:03:17 +0000 (06:03 -0700)]
am
f31da76a: Merge "Remove period from "No service."" into klp-dev
* commit '
f31da76a3a36c75eafa7078a90d982c0e6916b41':
Remove period from "No service."
John Spurlock [Wed, 28 Aug 2013 12:56:20 +0000 (08:56 -0400)]
SystemUI asset update post ux asset merge.
Bug:
10502089
Change-Id: I88b0b4a17018766bccb99426f8f270214c883427
Daniel Sandler [Wed, 28 Aug 2013 13:01:20 +0000 (13:01 +0000)]
Merge "Remove period from "No service."" into klp-dev
Daniel Sandler [Thu, 13 Jun 2013 19:58:26 +0000 (15:58 -0400)]
Remove period from "No service."
Bug:
10460869
Change-Id: I57b030518c9cfec367da21e39af7a001a565daa4
Zhijun He [Wed, 28 Aug 2013 02:24:59 +0000 (19:24 -0700)]
am
5b6ce5a2: Merge "ImageReader: Fix null listener case" into klp-dev
* commit '
5b6ce5a2921caa63481630f877356e5678ee9ffa':
ImageReader: Fix null listener case
Zhijun He [Wed, 28 Aug 2013 02:22:36 +0000 (02:22 +0000)]
Merge "ImageReader: Fix null listener case" into klp-dev
John Spurlock [Wed, 28 Aug 2013 01:31:34 +0000 (18:31 -0700)]
am
ae73139f: Merge "Remove unreferenced assets from SystemUI." into klp-dev
* commit '
ae73139f37a34cb4cc51255cc15cd19fbc11416a':
Remove unreferenced assets from SystemUI.
John Spurlock [Wed, 28 Aug 2013 01:26:13 +0000 (01:26 +0000)]
Merge "Remove unreferenced assets from SystemUI." into klp-dev
Jeff Hao [Wed, 28 Aug 2013 01:21:27 +0000 (18:21 -0700)]
am
09944b04: am
6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
* commit '
09944b04fa29eca7f889413988a05a268a5521f5':
Merge MPSE and SPSE Chunk handlers for ddms.
Jeff Hao [Wed, 28 Aug 2013 01:21:23 +0000 (18:21 -0700)]
am
5d21168b: am
366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
* commit '
5d21168bb4b33fb5eb8770996895a729880c7dbc':
Add frameworks support for sample profiling from traceview gui.
Jeff Hao [Wed, 28 Aug 2013 01:18:47 +0000 (18:18 -0700)]
am
6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms."
* commit '
6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4':
Merge MPSE and SPSE Chunk handlers for ddms.
Jeff Hao [Wed, 28 Aug 2013 01:18:43 +0000 (18:18 -0700)]
am
366291e2: Merge "Add frameworks support for sample profiling from traceview gui."
* commit '
366291e2830b96268458dd6c5b15412e46d93145':
Add frameworks support for sample profiling from traceview gui.
Jeff Hao [Wed, 28 Aug 2013 01:14:26 +0000 (01:14 +0000)]
Merge "Merge MPSE and SPSE Chunk handlers for ddms."
Jeff Hao [Wed, 28 Aug 2013 01:14:20 +0000 (01:14 +0000)]
Merge "Add frameworks support for sample profiling from traceview gui."
Jeff Hao [Tue, 27 Aug 2013 01:47:18 +0000 (18:47 -0700)]
Merge MPSE and SPSE Chunk handlers for ddms.
(cherry picked from commit
fd224b97797dfb7e3ee1e2f56c3109d1594cf040)
Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
Baligh Uddin [Wed, 28 Aug 2013 00:49:14 +0000 (17:49 -0700)]
am
ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ef8000670e0a61085572eeb8ee9115cecebb73a7':
Import translations. DO NOT MERGE
Jeff Hao [Thu, 22 Aug 2013 22:53:12 +0000 (15:53 -0700)]
Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit
ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
Baligh Uddin [Wed, 28 Aug 2013 00:45:47 +0000 (00:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 28 Aug 2013 00:45:45 +0000 (17:45 -0700)]
am
c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c513608dc1944ec8c6578110e47dc60fc9fda4e1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 28 Aug 2013 00:45:42 +0000 (17:45 -0700)]
am
397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
397c7aaf8d9a888727f3d1f54282420ee4f830d3':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Wed, 28 Aug 2013 00:43:53 +0000 (17:43 -0700)]
Fix bug #
10515013 CalendarView is always forcing first day of the week to Sunday and not taking into account CLDR data
- remove the "force to Sunday"
- code cleaning and remove dependency on deprecated API
Change-Id: I992e893a904c45c8e0ce1d9dedb59b352e3a449f
Baligh Uddin [Wed, 28 Aug 2013 00:42:58 +0000 (00:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 28 Aug 2013 00:42:35 +0000 (00:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Svetoslav Ganov [Wed, 28 Aug 2013 00:10:10 +0000 (17:10 -0700)]
am
ca09dbc6: Merge "Print APIs update." into klp-dev
* commit '
ca09dbc67b28d5d1d16b7966b855229697c6c549':
Print APIs update.
Svetoslav Ganov [Wed, 28 Aug 2013 00:07:08 +0000 (00:07 +0000)]
Merge "Print APIs update." into klp-dev
Santos Cordon [Tue, 27 Aug 2013 23:45:37 +0000 (16:45 -0700)]
Protecting against NPE with null country detector.
bug:
10514454
Change-Id: I316c47eddbe4929599866a3f9da9129d0056e3e2
Martijn Coenen [Tue, 27 Aug 2013 23:11:32 +0000 (16:11 -0700)]
am
bbbc8660: Merge "Add NFC reader-mode API." into klp-dev
* commit '
bbbc8660cdbfb033291f1911742a942a42c85af0':
Add NFC reader-mode API.
Martijn Coenen [Tue, 27 Aug 2013 23:08:56 +0000 (23:08 +0000)]
Merge "Add NFC reader-mode API." into klp-dev
Zhijun He [Tue, 27 Aug 2013 23:02:21 +0000 (16:02 -0700)]
ImageReader: Fix null listener case
Only do the handler check when listener is not null.
Bug:
10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
Alan Viverette [Tue, 27 Aug 2013 22:52:50 +0000 (15:52 -0700)]
am
3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
* commit '
3d1b3cb9d9ea206d4244ed369224faf4d859973e':
Add documentation to onTouchEvent for accessibility
Sreeram Ramachandran [Tue, 27 Aug 2013 22:49:25 +0000 (15:49 -0700)]
am
d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev
* commit '
d8d4c51e3b966b9eaff391f736c716343984e79b':
Fix channel set option in wifi batch scan command.
Alan Viverette [Tue, 27 Aug 2013 22:48:03 +0000 (22:48 +0000)]
Merge "Add documentation to onTouchEvent for accessibility" into klp-dev
Sreeram Ramachandran [Tue, 27 Aug 2013 22:45:30 +0000 (22:45 +0000)]
Merge "Fix channel set option in wifi batch scan command." into klp-dev
Alan Viverette [Tue, 27 Aug 2013 22:45:16 +0000 (15:45 -0700)]
Add public API for obtaining drag-to-open listener
BUG:
10457019
Change-Id: I66485521c54b82033044834e7aab6707a3049e6b
John Spurlock [Tue, 27 Aug 2013 21:53:08 +0000 (17:53 -0400)]
Remove unreferenced assets from SystemUI.
Bug:
10502089
Change-Id: I9c414ff88054a764ab56f70ae8a0c0c82c248be9
Sreeram Ramachandran [Tue, 27 Aug 2013 21:49:23 +0000 (14:49 -0700)]
Fix channel set option in wifi batch scan command.
Fix by not including extraneous delimiters, and changing the delimiter from a
space to a comma.
Bug:
10444428
Change-Id: Ia3197045d44a2f959316935ae085575500e65459
Martijn Coenen [Tue, 27 Aug 2013 21:32:53 +0000 (14:32 -0700)]
Add NFC reader-mode API.
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.
Bug:
10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
Craig Mautner [Tue, 27 Aug 2013 21:23:07 +0000 (14:23 -0700)]
am
61f0f9ad: Merge "When adding a window evaluate all tasks." into klp-dev
* commit '
61f0f9ada51a6718075acfe7fafbb9954f38e980':
When adding a window evaluate all tasks.
Craig Mautner [Tue, 27 Aug 2013 21:23:04 +0000 (14:23 -0700)]
am
ac738a25: Merge "Hide stackId from prying eyes." into klp-dev
* commit '
ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3':
Hide stackId from prying eyes.
Craig Mautner [Tue, 27 Aug 2013 21:20:52 +0000 (21:20 +0000)]
Merge "When adding a window evaluate all tasks." into klp-dev
Craig Mautner [Tue, 27 Aug 2013 21:20:30 +0000 (21:20 +0000)]
Merge "Hide stackId from prying eyes." into klp-dev
Christopher Tate [Tue, 27 Aug 2013 21:19:29 +0000 (14:19 -0700)]
am
d381680b: Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev
* commit '
d381680b63a36f8a4f1b07286947f1227d83139d':
Make sure to actually log when Log.wtf() hiccups
Christopher Tate [Tue, 27 Aug 2013 21:15:03 +0000 (21:15 +0000)]
Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev
Christopher Tate [Tue, 27 Aug 2013 21:10:44 +0000 (14:10 -0700)]
Make sure to actually log when Log.wtf() hiccups
Bug
10494724
Change-Id: I687d7df73a8f4594d42955f100d928e98bbd9b30
Sandeep Siddhartha [Tue, 27 Aug 2013 20:36:05 +0000 (13:36 -0700)]
am
572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev
* commit '
572ec4e88c943e0ec717b773406aca43a5eafcb9':
Temporary disable Hotword on lockscreen
Sandeep Siddhartha [Tue, 27 Aug 2013 20:31:32 +0000 (20:31 +0000)]
Merge "Temporary disable Hotword on lockscreen" into klp-dev
Sandeep Siddhartha [Tue, 27 Aug 2013 20:25:40 +0000 (13:25 -0700)]
Temporary disable Hotword on lockscreen
Change-Id: Icdddcc0308b9f3153172e34a8f4d051c58829653
Craig Mautner [Tue, 27 Aug 2013 20:25:17 +0000 (13:25 -0700)]
When adding a window evaluate all tasks.
Previously the code was adding a window based only on the tasks on
the stack belonging to the window being added. But if a window from
another stack was on top the window would be added out of order.
In particular when there was a dialog over the launcher app and the
device was rotated, the launcher window was being added over the
dialog. This caused the launcher icons to obscure the dialog and for
the dialog buttons to be untouchable.
Fixes bug
9984067.
Change-Id: I9a57eb641d118f4a90e98af8ca77127ab5364e79
John Spurlock [Tue, 27 Aug 2013 20:18:56 +0000 (13:18 -0700)]
am
373bc292: Merge "Fix NPE for devices w/out soft-nav." into klp-dev
* commit '
373bc2929260157e5695d29a01c9a19f8d1d5714':
Fix NPE for devices w/out soft-nav.
John Spurlock [Tue, 27 Aug 2013 20:16:30 +0000 (20:16 +0000)]
Merge "Fix NPE for devices w/out soft-nav." into klp-dev
John Spurlock [Tue, 27 Aug 2013 20:08:28 +0000 (16:08 -0400)]
Fix NPE for devices w/out soft-nav.
And fix other places w/out null guards in PhoneStatusBar.
Bug:
10507892
Change-Id: I1be1b4c88bedd097530fd44d3506b716957f9c14
Chet Haase [Tue, 27 Aug 2013 19:51:56 +0000 (12:51 -0700)]
am
f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev
* commit '
f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61':
Fix NPE when setting new LayoutTransition
Chet Haase [Tue, 27 Aug 2013 19:49:28 +0000 (19:49 +0000)]
Merge "Fix NPE when setting new LayoutTransition" into klp-dev
Fabrice Di Meglio [Tue, 27 Aug 2013 19:28:43 +0000 (12:28 -0700)]
am
6d7771b5: Merge "Fix bug #
10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev
* commit '
6d7771b575ec9303515128e98fcb67689414ac6e':
Fix bug #
10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()
Chet Haase [Tue, 27 Aug 2013 19:22:29 +0000 (12:22 -0700)]
Fix NPE when setting new LayoutTransition
ViewGroup.setLayoutTransition() has logic to cancel a previously-running
transition and remove the ViewGroup's listener from that transition. However,
it is possible for the transition to be set to null on the ViewGroup on the
cancel() call, making the next call to remove the listener crash with an NPE.
The fix is to use a temporary variable to hold the old reference and
not depend on the class instance variable remaining valid/non-null across
the call to cancel().
Issue #
10488932 Hangout NPE in ViewGroup.setLayoutTransition on initiating a new conversation
Issue #
10509201 ViewGroup.setLayoutTransition(null) causes crash when being called in LayoutTransition.TransitionListener.endTransition()
Change-Id: I7c181b79e6601024c93a8dc246d32b751f78b216
Fabrice Di Meglio [Tue, 27 Aug 2013 19:04:12 +0000 (19:04 +0000)]
Merge "Fix bug #
10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev
Svetoslav Ganov [Tue, 27 Aug 2013 07:30:54 +0000 (00:30 -0700)]
Print APIs update.
1. Added scale to fit and scale to fill fitting modes.
2. Added APIs for a print app to specify which constraints imposed
by the print attributes were satsified during a layout so they
are not handled by the printer again, e.g. if the content is to
be in landscape the the app generated such content the printer
should rotate the content again.
3. Added some printer statuses.
4. Added a helper class that generates PDF documents with correct
size based on the passed in print attributes.
5. Exposed a ctor for PageRange which was hidden by mistake and apps
could not create page ranges. Added API for changing the printer
status.
Change-Id: If1334a61d2d931027b98075f653018d456b1b768
Tom O'Neill [Tue, 27 Aug 2013 18:28:22 +0000 (11:28 -0700)]
am
aeda265c: Merge "Remove or reduce visibility of deprecated methods" into klp-dev
* commit '
aeda265c4dcdd60484f9d1923e3fdcba761112e0':
Remove or reduce visibility of deprecated methods
Chris Wren [Tue, 27 Aug 2013 18:24:54 +0000 (11:24 -0700)]
am
d220a830: Merge "Change DBG to false to eliminate logcat messages." into klp-dev
* commit '
d220a830f4fb0e13e31d7632eb04f70fedd31e97':
Change DBG to false to eliminate logcat messages.
Tom O'Neill [Tue, 27 Aug 2013 18:23:18 +0000 (18:23 +0000)]
Merge "Remove or reduce visibility of deprecated methods" into klp-dev
Chris Wren [Tue, 27 Aug 2013 18:20:44 +0000 (18:20 +0000)]
Merge "Change DBG to false to eliminate logcat messages." into klp-dev
Svetoslav Ganov [Tue, 27 Aug 2013 18:16:04 +0000 (11:16 -0700)]
am
6b8c69ed: Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev
* commit '
6b8c69edd210ad86eb659e06681422bb29ba2123':
Update AccessibilityNodeInfo API as per API council request
Svetoslav Ganov [Tue, 27 Aug 2013 18:14:00 +0000 (18:14 +0000)]
Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev
Chris Craik [Tue, 27 Aug 2013 18:11:55 +0000 (11:11 -0700)]
am
ece3c9a0: am
3c0624aa: Merge "Forward compatibility fix"
* commit '
ece3c9a0a00849f7396635ec1ded7be58d899b30':
Forward compatibility fix
Chris Craik [Tue, 27 Aug 2013 18:09:33 +0000 (11:09 -0700)]
am
3c0624aa: Merge "Forward compatibility fix"
* commit '
3c0624aa1ae9c7d147a3b0f3ea8c05fc4bc4187a':
Forward compatibility fix