git.osdn.net Git - android-x86/frameworks-base.git/log

Dongwon Kang [Thu, 30 Oct 2014 05:15:22 +0000 (05:15 +0000)]

TIF: handle inputs holding the overlay view even after the session release
automerge: ce34c6d

* commit 'ce34c6d308629c214ab9b7963755eb60cac03c9d':
TIF: handle inputs holding the overlay view even after the session release

commit | commitdiff | tree

Dongwon Kang [Thu, 30 Oct 2014 04:42:39 +0000 (04:42 +0000)]

am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev

* commit 'c1f26faa2db2062ed42e422b038442fdb0aa3c68':
TIF: Handle notifyXXX() calls requested before the session initialization

commit | commitdiff | tree

Dongwon Kang [Mon, 27 Oct 2014 08:55:27 +0000 (17:55 +0900)]

TIF: handle inputs holding the overlay view even after the session release

Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2

commit | commitdiff | tree

Dongwon Kang [Thu, 30 Oct 2014 04:32:29 +0000 (04:32 +0000)]

Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev

commit | commitdiff | tree

Yigit Boyar [Thu, 30 Oct 2014 02:18:38 +0000 (02:18 +0000)]

am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev

* commit '33d9dc46cfbe42e508b2c4b97801059964b3476b':
Move all actionbar related methods to DecorToolbar

commit | commitdiff | tree

Yigit Boyar [Thu, 30 Oct 2014 02:02:14 +0000 (02:02 +0000)]

Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:57:06 +0000 (00:57 +0000)]

am a9ba2cdf: Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev

* commit 'a9ba2cdfc10f8bdeee2bd8fb95432df873003f44':
Ensure ImageView.setImageResource() always resolves Drawable

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:52:16 +0000 (00:52 +0000)]

Merge "Ensure ImageView.setImageResource() always resolves Drawable" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:45:56 +0000 (00:45 +0000)]

am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev

* commit '674a3a21cba94c129b322b05bbaaf9b1fc8afbd8':
Distinguish unspecified and explicit null values in resources

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:41:42 +0000 (00:41 +0000)]

Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev

commit | commitdiff | tree

Dongwon Kang [Wed, 29 Oct 2014 05:39:27 +0000 (14:39 +0900)]

TIF: Handle notifyXXX() calls requested before the session initialization

Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.

Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:30:11 +0000 (00:30 +0000)]

am 425b1dc8: Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev

* commit '425b1dc88c47e0e9d3a653ad902a69f3ec09b966':
Add theme and config change support to more Drawable types

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:26:37 +0000 (17:26 -0700)]

Ensure ImageView.setImageResource() always resolves Drawable

Fixes no-op on method call after configuration change at the expense
of removing a micro-optimization that wasn't really needed.

BUG: 18178233
Change-Id: I36eccf91b138e4bed34be96d9b87200edeb66938

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:24:27 +0000 (00:24 +0000)]

Merge "Add theme and config change support to more Drawable types" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:22:05 +0000 (00:22 +0000)]

am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev

* commit '104504053d33d337d52350960c48a1edc5ba1444':
Show scroll indicators in AlertDialog

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:18:31 +0000 (00:18 +0000)]

Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:46:06 +0000 (15:46 -0700)]

Show scroll indicators in AlertDialog

BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd

commit | commitdiff | tree

Alan Viverette [Thu, 30 Oct 2014 00:09:36 +0000 (17:09 -0700)]

Distinguish unspecified and explicit null values in resources

BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:58:44 +0000 (23:58 +0000)]

am f769c981: am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

* commit 'f769c98172186a8767d309492b6179b5de0d11cd':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:58:38 +0000 (23:58 +0000)]

am 20dfe399: am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

* commit '20dfe399a68a6542f1787546da01a41a92ca3ab3':
Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:49:03 +0000 (23:49 +0000)]

am 4d9872e6: am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

* commit '4d9872e6ecc221d3c8bbd66b8efee819d12dbb90':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:48:53 +0000 (23:48 +0000)]

am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

* commit '63ee197682bf7cf831950087028b2a81902f92c9':
Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:26:18 +0000 (23:26 +0000)]

am 1649712f: am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

* commit '1649712f8745f6b62e453b8b4a230374308732ce':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:20:34 +0000 (23:20 +0000)]

am 13d7ea46: (-s ours) DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

* commit '13d7ea464ec7947a0c55cd778c8b2bacc9d0745d':
DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:19:46 +0000 (23:19 +0000)]

am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

Adam Lesinski [Wed, 29 Oct 2014 23:15:33 +0000 (23:15 +0000)]

am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev

* commit '720a5c51beb5beab442832ea8d169aa5b4edb43f':
Add dumpsys output to UsageStatsService, along with --checkin support

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:12:52 +0000 (23:12 +0000)]

am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

Adam Lesinski [Wed, 29 Oct 2014 23:11:52 +0000 (23:11 +0000)]

Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev

commit | commitdiff | tree

Wale Ogunwale [Wed, 29 Oct 2014 23:11:10 +0000 (23:11 +0000)]

am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev

* commit 'a232953ea3f7eedfdd4dd7b58b63886433dbdd56':
Fix issue 6455374: Bad recent image on camera launch from lockscreen.

commit | commitdiff | tree

Eric Laurent [Wed, 29 Oct 2014 23:11:05 +0000 (23:11 +0000)]

am c0c1255a: Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev

* commit 'c0c1255a930bf0c2104f82c05f430b34112cc1bf':
SoundTrigger JNI: fix local reference leak.

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:09:23 +0000 (23:09 +0000)]

am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.

commit | commitdiff | tree

Wale Ogunwale [Wed, 29 Oct 2014 23:08:20 +0000 (23:08 +0000)]

Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev

commit | commitdiff | tree

Eric Laurent [Wed, 29 Oct 2014 23:07:31 +0000 (23:07 +0000)]

Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev

commit | commitdiff | tree

kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]

DO NOT MERGE - Doc update: deliv receipt, rate exceeded, bug fixes.

Cherry-pick from: Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

Fix for:
b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

commit | commitdiff | tree

kmccormick [Wed, 29 Oct 2014 23:04:28 +0000 (23:04 +0000)]

Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:56:07 +0000 (22:56 +0000)]

am 4e7c562c: Merge "Update drawable state after updating tint list" into lmp-mr1-dev

* commit '4e7c562c43e9014c8fb3e75d02ba98fa4edadbde':
Update drawable state after updating tint list

commit | commitdiff | tree

Svetoslav [Wed, 29 Oct 2014 22:56:02 +0000 (22:56 +0000)]

am d3786a59: Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev

* commit 'd3786a5931cde3f76dc5cd702d3ba246246fdf47':
Print preview disappearing if printer is changed.

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:55:57 +0000 (22:55 +0000)]

am 2d3443fc: Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev

* commit '2d3443fc5a6cf0830edd6a498a87760143dbc570':
Add setters for window elevation and clipToOutline properties

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:55:53 +0000 (22:55 +0000)]

am 66c0adcf: Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev

* commit '66c0adcfd4351518512df2f3e81526d2d67d6d65':
Ensure accessibility focus rect is drawn correctly

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:55:47 +0000 (22:55 +0000)]

am 8785a56c: Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev

* commit '8785a56c8f35863b7f02769b6021fba7000f6403':
Create translucent hardware renderer if surface insets are non-zero

commit | commitdiff | tree

Dianne Hackborn [Wed, 29 Oct 2014 22:55:42 +0000 (22:55 +0000)]

am 7ef46316: Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev

* commit '7ef463168c9ba08548858df086934b125c1ff57c':
Condense AndroidRuntime init log, include uid running under.

commit | commitdiff | tree

Tom Taylor [Wed, 29 Oct 2014 22:55:37 +0000 (22:55 +0000)]

am de48e880: Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev

* commit 'de48e8809ec5bd208ca032824c0fe607ed57af1d':
Add a missing mms_config constant to SmsManager

commit | commitdiff | tree

Jeff Hao [Wed, 29 Oct 2014 22:55:29 +0000 (22:55 +0000)]

am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

* commit 'b1346d7829b83bcd813bc73506525822f4148429':
Change boot screen title to "Android is starting" when not upgrading.

commit | commitdiff | tree

Tyler Gunn [Wed, 29 Oct 2014 22:55:20 +0000 (22:55 +0000)]

am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev

* commit '167230987b3224c30f2ecefa90a83fc19d449cf9':
Communicating participant changes to conference controller.

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:55:09 +0000 (22:55 +0000)]

am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

* commit 'd86d7bce78a5f6e70bdac8f6d4bb1a968d440128':
Use action mode context for ActionMode menu inflater

commit | commitdiff | tree

Vladimir Marko [Wed, 29 Oct 2014 22:55:04 +0000 (22:55 +0000)]

am 85d6f299: Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev

* commit '85d6f299943017f939ecfee9708f10b4e5fddd3e':
Fix android_media_AudioSystem_getMasterMute return type.

commit | commitdiff | tree

Chris Wren [Wed, 29 Oct 2014 22:54:56 +0000 (22:54 +0000)]

am 755f4021: fix build break from mis-named DEBUG flag in SystemUI

* commit '755f4021ae9a21936a04083098ffbbdac912625c':
fix build break from mis-named DEBUG flag in SystemUI

commit | commitdiff | tree

Chris Wren [Wed, 29 Oct 2014 22:54:16 +0000 (22:54 +0000)]

am b7efa04d: Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev

* commit 'b7efa04d529b87672b1167341852eca8ee9813c7':
Add logging to diagnose notification click issue.

commit | commitdiff | tree

Andre Eisenbach [Wed, 29 Oct 2014 22:54:10 +0000 (22:54 +0000)]

am e2502eb9: Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev

* commit 'e2502eb9ad5eafc54ae06f06a72493748616dbd5':
Fix crash during Bluetooth on/off stress test

commit | commitdiff | tree

David Friedman [Wed, 29 Oct 2014 22:54:03 +0000 (22:54 +0000)]

am 543a82ed: am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.

* commit '543a82edd5a0a921570335e71004f33a3a68438f':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 29 Oct 2014 22:53:58 +0000 (22:53 +0000)]

am 5456230d: am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.

* commit '5456230d3b071cf699a4523f3f33bfcb5be4f54c':
Add missing delegate for AnimatorInflater.

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Oct 2014 22:53:54 +0000 (22:53 +0000)]

am 9bff44bd: (-s ours) am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '9bff44bdc4d91a1502bf2d30c0cbbe76751657f1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Oct 2014 22:53:48 +0000 (22:53 +0000)]

am 2c5e5ef5: (-s ours) am c88fbd3c: (-s ours) Import translations. DO NOT MERGE

* commit '2c5e5ef50cfe0452935d319936335e655dee894d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Wink Saville [Wed, 29 Oct 2014 22:53:44 +0000 (22:53 +0000)]

am 0d1356c4: (-s ours) am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '0d1356c4f1a6627e10b2c587a5e3f415e2da1064':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Deepanshu Gupta [Wed, 29 Oct 2014 22:53:39 +0000 (22:53 +0000)]

am bf59e897: am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev

* commit 'bf59e8974d0c18dd3fd14631ad03de66d271a186':
Skip loading animations.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 29 Oct 2014 22:53:34 +0000 (22:53 +0000)]

am 122ccfb0: am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev

* commit '122ccfb08fdde43793159d17d263271a0d311a1f':
Fix multiple styles case in resource resolution.

commit | commitdiff | tree

Deepanshu Gupta [Wed, 29 Oct 2014 22:53:29 +0000 (22:53 +0000)]

am 62cf56cf: am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev

* commit '62cf56cf99204bc3912119e8bed06e43f7ba6da9':
Use right theme for drawable inflation.

commit | commitdiff | tree

Eric Laurent [Wed, 29 Oct 2014 22:52:43 +0000 (15:52 -0700)]

SoundTrigger JNI: fix local reference leak.

Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:51:47 +0000 (22:51 +0000)]

am 7a0ae7ed: Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev

* commit '7a0ae7ed31a9e7e296c549dfbf035bf4270be69c':
Add content description to Toolbar collapse button

commit | commitdiff | tree

Andre Eisenbach [Wed, 29 Oct 2014 22:51:38 +0000 (22:51 +0000)]

am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev

* commit 'db41880dd3259646b9ea43be6d8a91d4adb40122':
Fix exception in AudioService when no BT Headset is connected.

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Oct 2014 22:50:44 +0000 (22:50 +0000)]

am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'ba9836d9726bbc7413a07ae2b86afde8adcd4cc3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Calin Juravle [Wed, 29 Oct 2014 22:50:39 +0000 (22:50 +0000)]

am ef0a7e8f: Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev

* commit 'ef0a7e8fdbf60d6e5cc5f274f94516c3077895e5':
Use native brige only if we have a private data directory.

commit | commitdiff | tree

Calin Juravle [Wed, 29 Oct 2014 22:50:34 +0000 (22:50 +0000)]

am 5b0f193d: Merge "PreInitializeNativeBridge only if its Available" into lmp-mr1-dev

* commit '5b0f193d25218557a23bdd7b4ee44d6932b71115':
PreInitializeNativeBridge only if its Available

commit | commitdiff | tree

John Spurlock [Wed, 29 Oct 2014 22:50:27 +0000 (22:50 +0000)]

am f9824b91: Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev

* commit 'f9824b91f3706bb29272564bbf9c51497b51f4a7':
PowerUI: Suppress warning on incremental drops.

commit | commitdiff | tree

Jason Monk [Wed, 29 Oct 2014 22:50:22 +0000 (22:50 +0000)]

am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev

* commit '5d80f19c145f99eb1a2ada57a6fb1d8c3a6fa8b2':
QS: Only hide grid if there is detail to show

commit | commitdiff | tree

Kenny Guy [Wed, 29 Oct 2014 22:50:16 +0000 (22:50 +0000)]

am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev

* commit '8cfb3f1e4dc76c4fa92e889991f0e9dd37823d1b':
Listen for package changes for all users not just owner.

commit | commitdiff | tree

Chris Wren [Wed, 29 Oct 2014 22:50:08 +0000 (22:50 +0000)]

am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev

* commit '402152d6736839d89a9179cd4371201020074797':
Reveal notification listener settings APIs.

commit | commitdiff | tree

John Reck [Wed, 29 Oct 2014 22:50:03 +0000 (22:50 +0000)]

am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev

* commit '141823ec6313d9545b8354ea1e3e017a1da3cfa8':
Be more conservative about current buffer

commit | commitdiff | tree

Jorim Jaggi [Wed, 29 Oct 2014 22:49:51 +0000 (22:49 +0000)]

am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev

* commit '81aef807d5f1e3e3b5eda1162829e666c295f352':
Improve doze transitions

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Oct 2014 22:49:46 +0000 (22:49 +0000)]

am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'a8a2844a1d2eeb77898e9f50ac2580896487113d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jorim Jaggi [Wed, 29 Oct 2014 22:49:40 +0000 (22:49 +0000)]

am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev

* commit '6533c544cfc3896793e038ae303ce5b9eafebdab':
Tune spacing in navigation bar for small and big devices

commit | commitdiff | tree

kmccormick [Tue, 14 Oct 2014 22:34:21 +0000 (15:34 -0700)]

Doc update: deliv receipt, rate exceeded, bug fixes.

Fix for:

b/17936796

Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e

commit | commitdiff | tree

Jorim Jaggi [Wed, 29 Oct 2014 22:49:33 +0000 (22:49 +0000)]

am b9e290c7: Cancel ripple animations when window is hidden

* commit 'b9e290c7136fb7c76b7238426ccd598dec2d2643':
Cancel ripple animations when window is hidden

commit | commitdiff | tree

Calin Juravle [Wed, 29 Oct 2014 22:49:28 +0000 (22:49 +0000)]

am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev

* commit 'd3a8c8aa530e6c1a605f469df7b378f688e7905a':
Fix the length of a profiler system property

commit | commitdiff | tree

Erik Kline [Wed, 29 Oct 2014 22:49:23 +0000 (22:49 +0000)]

am befe778c: Treat optimistic addresses as global preferred.

* commit 'befe778c73e48417942fc31c06509bac8e5ca0d2':
Treat optimistic addresses as global preferred.

commit | commitdiff | tree

Jinsuk Kim [Wed, 29 Oct 2014 22:49:16 +0000 (22:49 +0000)]

am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev

* commit '8be95fdde6a359e40e0b8bc6fb7bc9ea6e6091b0':
CEC: Use language code "chi" for Traditional Chinese

commit | commitdiff | tree

Anthony Lee [Wed, 29 Oct 2014 22:49:10 +0000 (22:49 +0000)]

am 6727926a: Added a function to clear accounts for a specified package.

* commit '6727926a9617cb715ee4fa407f547e67a6f7e134':
Added a function to clear accounts for a specified package.

commit | commitdiff | tree

Lorenzo Colitti [Wed, 29 Oct 2014 22:49:05 +0000 (22:49 +0000)]

am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev

* commit 'def4cd4fa4aa035a5000e6b196130496430d65ff':
Support more than one clatd at a time.

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:48:52 +0000 (22:48 +0000)]

am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev

* commit '05b2fedcb8057f31ed078a59a8cffce131449df0':
Inflate ActionMode items against the ActionBarContextView theme

commit | commitdiff | tree

Shishir Agrawal [Wed, 29 Oct 2014 22:48:43 +0000 (22:48 +0000)]

am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev

* commit 'c8787beca679ca593dda05bb151ebe4afdf441c8':
Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37

commit | commitdiff | tree

Ihab Awad [Wed, 29 Oct 2014 22:48:34 +0000 (22:48 +0000)]

am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev

* commit '6c37f374b5d86c798f799ac498b806d948c77f97':
PhoneAccounts include literal icon bitmap (1/4)

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:20:17 +0000 (22:20 +0000)]

Merge "Update drawable state after updating tint list" into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Wed, 29 Oct 2014 22:17:56 +0000 (22:17 +0000)]

Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:05:09 +0000 (22:05 +0000)]

Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:05:04 +0000 (22:05 +0000)]

Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 22:05:00 +0000 (22:05 +0000)]

Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 29 Oct 2014 21:55:49 +0000 (21:55 +0000)]

Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev

commit | commitdiff | tree

Tom Taylor [Wed, 29 Oct 2014 21:55:32 +0000 (21:55 +0000)]

Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev

commit | commitdiff | tree

Jeff Hao [Wed, 29 Oct 2014 21:47:29 +0000 (21:47 +0000)]

Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

commit | commitdiff | tree

Jeff Hao [Wed, 29 Oct 2014 01:51:07 +0000 (18:51 -0700)]

Change boot screen title to "Android is starting" when not upgrading.

Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de

commit | commitdiff | tree

Tyler Gunn [Wed, 29 Oct 2014 21:32:52 +0000 (21:32 +0000)]

Merge "Communicating participant changes to conference controller." into lmp-mr1-dev

commit | commitdiff | tree

Tom Taylor [Wed, 29 Oct 2014 21:30:37 +0000 (14:30 -0700)]

Add a missing mms_config constant to SmsManager

Bug 18079788

Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 21:27:47 +0000 (14:27 -0700)]

Add setters for window elevation and clipToOutline properties

These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.

BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69

commit | commitdiff | tree

Alan Viverette [Wed, 29 Oct 2014 21:14:55 +0000 (21:14 +0000)]

Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev

commit | commitdiff | tree

Vladimir Marko [Wed, 29 Oct 2014 21:12:07 +0000 (21:12 +0000)]

Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev

commit | commitdiff | tree

Svetoslav [Wed, 29 Oct 2014 20:49:00 +0000 (13:49 -0700)]

Print preview disappearing if printer is changed.

This is a regression caused by my previous patch.

Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d

commit | commitdiff | tree

Chris Wren [Wed, 29 Oct 2014 20:43:26 +0000 (16:43 -0400)]

fix build break from mis-named DEBUG flag in SystemUI

Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e

commit | commitdiff | tree

Vladimir Marko [Wed, 29 Oct 2014 20:34:15 +0000 (20:34 +0000)]

Fix android_media_AudioSystem_getMasterMute return type.

Caused FPU stack overflow on x86.

Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192

commit | commitdiff | tree

Chris Wren [Wed, 29 Oct 2014 19:54:51 +0000 (19:54 +0000)]

Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Tue, 28 Oct 2014 21:41:36 +0000 (14:41 -0700)]

Update drawable state after updating tint list

BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59