Dianne Hackborn
7ef463168c
Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
2014-10-29 21:55:50 +00:00
Tom Taylor
de48e8809e
Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
2014-10-29 21:55:33 +00:00
Jeff Hao
b1346d7829
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
2014-10-29 21:47:30 +00:00
Jeff Hao
9f60c08a44
Change boot screen title to "Android is starting" when not upgrading.
...
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
2014-10-29 14:42:39 -07:00
Tyler Gunn
167230987b
Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
2014-10-29 21:32:53 +00:00
Tom Taylor
4aa3684017
Add a missing mms_config constant to SmsManager
...
Bug 18079788
Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
2014-10-29 14:30:37 -07:00
Alan Viverette
79c067c54a
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
2014-10-29 14:27:47 -07:00
Ricardo Cervera
9a6fdfe853
docs: Two-page notification fix.
...
Bug: 18108228
Change-Id: I96863766dc3b787af92e8bf71615eee56afbbca9
2014-10-29 14:27:22 -07:00
Alan Viverette
d86d7bce78
Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
2014-10-29 21:14:56 +00:00
Vladimir Marko
85d6f29994
Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
2014-10-29 21:12:08 +00:00
Svetoslav
7c053c1e41
Print preview disappearing if printer is changed.
...
This is a regression caused by my previous patch.
Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
2014-10-29 13:50:42 -07:00
Chris Wren
755f4021ae
fix build break from mis-named DEBUG flag in SystemUI
...
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
2014-10-29 16:43:51 -04:00
Vladimir Marko
c1bcdbb758
Fix android_media_AudioSystem_getMasterMute return type.
...
Caused FPU stack overflow on x86.
Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
2014-10-29 20:34:15 +00:00
Chris Wren
b7efa04d52
Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev
2014-10-29 19:54:52 +00:00
Alan Viverette
d513379239
Update drawable state after updating tint list
...
BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
2014-10-29 19:46:54 +00:00
Andre Eisenbach
e2502eb9ad
Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev
2014-10-29 19:35:19 +00:00
Andre Eisenbach
178d3b54cd
Fix crash during Bluetooth on/off stress test
...
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
2014-10-29 12:13:38 -07:00
David Friedman
543a82edd5
am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '51209aa38ee9895c639fbbb6f469f926f3c66b7f':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:52:29 +00:00
Deepanshu Gupta
5456230d3b
am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
Add missing delegate for AnimatorInflater.
2014-10-29 18:52:21 +00:00
Geoff Mendal
9bff44bdc4
am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '39ae5dd786aff204888457a648ed291926e33334':
Import translations. DO NOT MERGE
2014-10-29 18:52:13 +00:00
Geoff Mendal
2c5e5ef50c
am c88fbd3c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c88fbd3cce87f67aad17c636b9e23b4e29afac6a':
Import translations. DO NOT MERGE
2014-10-29 18:52:00 +00:00
Wink Saville
0d1356c4f1
am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'f7543b40d25db5cc089a4cadea6c1444a56d3b25':
Import translations. DO NOT MERGE
2014-10-29 18:51:49 +00:00
Deepanshu Gupta
bf59e8974d
am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev
...
* commit 'de4ee0f1be350a52d642a447269a91f6d28e73fc':
Skip loading animations.
2014-10-29 18:51:32 +00:00
Deepanshu Gupta
122ccfb08f
am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev
...
* commit '916d779650352059b08b7257f71a7aab8b333eba':
Fix multiple styles case in resource resolution.
2014-10-29 18:51:28 +00:00
Deepanshu Gupta
62cf56cf99
am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev
...
* commit '6fb2fda85c410e23a1b9366c025fe288447bf027':
Use right theme for drawable inflation.
2014-10-29 18:51:23 +00:00
Chris Wren
79ac09e439
Add logging to diagnose notification click issue.
...
Bug: 18102199
Change-Id: Id022faa7b75f28f446155f15ab4a8373869c163c
2014-10-29 14:38:01 -04:00
David Friedman
51209aa38e
am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '43582423ee64b4d1e8f0186e34494cc7f7519488':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:20:19 +00:00
David Friedman
43582423ee
am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '0fa6edced7496b898d31ff7dab7255a1e0dffa9b':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:15:31 +00:00
Alan Viverette
2b12b58f94
Create translucent hardware renderer if surface insets are non-zero
...
BUG: 18160604
Change-Id: Ie4483b9841bd91778659d83b154f69e777fa1dfc
2014-10-29 11:11:40 -07:00
Alan Viverette
3abf5c4bd1
Use action mode context for ActionMode menu inflater
...
BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
2014-10-29 11:03:35 -07:00
Alan Viverette
7a0ae7ed31
Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
2014-10-29 18:00:12 +00:00
Deepanshu Gupta
03b100e11d
am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit '617e809731d775d9e05758689bab024e34c9afbf':
Add missing delegate for AnimatorInflater.
2014-10-29 17:52:04 +00:00
Dianne Hackborn
8e5aafe57d
Condense AndroidRuntime init log, include uid running under.
...
Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
2014-10-29 10:45:25 -07:00
Yigit Boyar
fe6d57c366
Move all actionbar related methods to DecorToolbar
...
Bug: 17999561
Change-Id: I36af443cf245aedd64a079726c1a2e6f6068f221
2014-10-29 17:34:45 +00:00
Alan Viverette
d21fd9d1cc
Add theme and config change support to more Drawable types
...
BUG: 16045735
Change-Id: Ic03173a1c1779c1bb545c4c389f77afed97011ee
2014-10-29 10:24:42 -07:00
Andre Eisenbach
db41880dd3
Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
2014-10-29 17:24:05 +00:00
Geoff Mendal
39ae5dd786
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-29 17:23:52 +00:00
Andre Eisenbach
570cc5302a
Fix exception in AudioService when no BT Headset is connected.
...
If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset
connected, a NullPointerException will ensue.
Added check to make sure mBluetoothHeadsetDevice is set before accessing
it.
Bug: 17601845
Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
2014-10-29 09:56:41 -07:00
Geoff Mendal
ba9836d972
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-29 16:19:47 +00:00
Calin Juravle
ef0a7e8fdb
Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev
2014-10-29 15:48:12 +00:00
Calin Juravle
5b0f193d25
Merge "PreInitializeNativeBridge only if its Available" into lmp-mr1-dev
2014-10-29 15:47:55 +00:00
Geoff Mendal
3b4a018326
Import translations. DO NOT MERGE
...
Change-Id: I490435f6897e37a152de298f96ed1541c208adbb
Auto-generated-cl: translation import
2014-10-29 08:43:34 -07:00
John Spurlock
f9824b91f3
Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev
2014-10-29 15:40:56 +00:00
Jason Monk
5d80f19c14
Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev
2014-10-29 15:38:58 +00:00
Geoff Mendal
3c8b334d02
Import translations. DO NOT MERGE
...
Change-Id: I63c0b33a09334fbb50cd62d6eccb43edee751e45
Auto-generated-cl: translation import
2014-10-29 08:37:57 -07:00
John Spurlock
42bfc9ab00
PowerUI: Suppress warning on incremental drops.
...
If the user explicitly dismisses the warning notification,
don't update the notification until the next threshold value.
Bug: 17691122
Change-Id: I840f33f787f1dd6f217de543a291bc9f65b1b046
2014-10-29 11:13:01 -04:00
Kenny Guy
8cfb3f1e4d
Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev
2014-10-29 15:05:02 +00:00
Jason Monk
98fa70c98f
QS: Only hide grid if there is detail to show
...
If the animation ends at the 'same' time as handleShowDetail is
running it is possible for the grid content to get cleared by the
animation callback just after it is shown in handleShowDetail.
This checks mDetailRecord to avoid that chance.
Bug: 18009138
Change-Id: Ia2951f44b5a1470321bf6580daf33917bbcb1ffd
2014-10-29 11:03:41 -04:00
Chris Wren
402152d673
Merge "Reveal notification listener settings APIs." into lmp-mr1-dev
2014-10-29 14:54:18 +00:00
John Reck
141823ec63
Merge "Be more conservative about current buffer" into lmp-mr1-dev
2014-10-29 14:40:02 +00:00