Adam Powell
9121107248
am b43a22e3: am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
...
* commit 'b43a22e3c870183855cd1c9ba4f9e152ed6d6af7':
Close context menu dialogs if the menu becomes empty
2013-10-08 15:41:58 -07:00
Dan Sandler
abdc01c6fb
am bc16fdc0: am 0dfec173: Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
...
* commit 'bc16fdc0a1493e40dfb53e7a46cc7b5d9f363779':
Revert "Show no_sim icon when no SIM card is available."
2013-10-08 15:41:56 -07:00
Adam Powell
b43a22e3c8
am 79782d7c: Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
...
* commit '79782d7ced41f548a9eac57473bd93faa4aba8b1':
Close context menu dialogs if the menu becomes empty
2013-10-08 15:35:58 -07:00
Dan Sandler
bc16fdc0a1
am 0dfec173: Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
...
* commit '0dfec173655173b6bcbefa40a4fa0d137ae13e31':
Revert "Show no_sim icon when no SIM card is available."
2013-10-08 15:35:55 -07:00
Adam Powell
79782d7ced
Merge "Close context menu dialogs if the menu becomes empty" into klp-dev
2013-10-08 22:34:26 +00:00
Dan Sandler
0dfec17365
Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev
2013-10-08 22:32:45 +00:00
Dan Sandler
99270a8972
Revert "Show no_sim icon when no SIM card is available."
...
It doesn't look good in the combo RSSI layout, and while we could make
it look better by adding some padding (like the airplane icon), we haven't
had a no_sim icon since ICS and people are pretty much OK with it.
This reverts commit 2eeacc02a252607e7c2fd1a00c60d8aa567694cc.
Bug: 11127588
Change-Id: Ibefd6096171588fcab1e3c5174abda9758cc5f6d
2013-10-08 22:31:25 +00:00
Adam Powell
fd71db8445
Close context menu dialogs if the menu becomes empty
...
If a view triggers showContextMenu while a context menu is already
shown but contributes no items to the menu the menu dialog would
become empty. Simply close the dialog if this happens.
Bug 11063885
Change-Id: I9e7c96073318c94eda5f1e1c4beb596b3d9da781
2013-10-08 15:20:29 -07:00
Svetoslav
e0ac69db93
am ea7f975b: am dcd05b44: Merge "Fix a crash in the select printers activity." into klp-dev
...
* commit 'ea7f975b957e3361211e250abdc3e46d995001cf':
Fix a crash in the select printers activity.
2013-10-08 14:35:16 -07:00
Nick Kralevich
fa06d03edf
am 0b8fd029: am a299862d: Merge "Fix App Ops permission mapping structure."
...
* commit '0b8fd029c052784d4adee940eaa904a339db6716':
Fix App Ops permission mapping structure.
2013-10-08 14:33:40 -07:00
Svetoslav
ea7f975b95
am dcd05b44: Merge "Fix a crash in the select printers activity." into klp-dev
...
* commit 'dcd05b440d81ededd567a417a6e10a02ccdfa07b':
Fix a crash in the select printers activity.
2013-10-08 14:32:19 -07:00
Michael Jurka
c9456566c8
am 04a938cf: am c39bfa9f: Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
...
* commit '04a938cf330ccfbe4c3ce0d9bc63268b08c8467f':
Wallpaper cropper should inherit translucent theme
2013-10-08 14:31:45 -07:00
John Spurlock
08de4b3279
am b772eb3c: am fe124594: Merge "Tweak status bar gradient." into klp-dev
...
* commit 'b772eb3c0381dbc2a2f235279c9d2680dcbdbe66':
Tweak status bar gradient.
2013-10-08 14:31:42 -07:00
Nick Kralevich
0b8fd029c0
am a299862d: Merge "Fix App Ops permission mapping structure."
...
* commit 'a299862dd2d46fda54678df07db66bef1a63bb9b':
Fix App Ops permission mapping structure.
2013-10-08 14:30:11 -07:00
Michael Jurka
04a938cf33
am c39bfa9f: Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
...
* commit 'c39bfa9f0eb16181bb1bb99721eea00af1145416':
Wallpaper cropper should inherit translucent theme
2013-10-08 14:28:50 -07:00
John Spurlock
b772eb3c03
am fe124594: Merge "Tweak status bar gradient." into klp-dev
...
* commit 'fe124594d66d4cf7a960bdc97215c0f178444269':
Tweak status bar gradient.
2013-10-08 14:28:44 -07:00
Svetoslav
dcd05b440d
Merge "Fix a crash in the select printers activity." into klp-dev
2013-10-08 21:28:13 +00:00
Michael Jurka
c39bfa9f0e
Merge "Wallpaper cropper should inherit translucent theme" into klp-dev
2013-10-08 21:27:14 +00:00
Nick Kralevich
a299862dd2
Merge "Fix App Ops permission mapping structure."
2013-10-08 21:25:24 +00:00
John Spurlock
fe124594d6
Merge "Tweak status bar gradient." into klp-dev
2013-10-08 21:25:11 +00:00
John Spurlock
02b1bdc28a
Tweak status bar gradient.
...
Bug:10967264
Change-Id: I803420ba332934398b4878644e3a168bd99701ad
2013-10-08 17:22:56 -04:00
Jeff Sharkey
ac50f60da6
am 58ff8af5: am a6af40cd: Merge "Add secondary external storage support." into klp-dev
...
* commit '58ff8af53a8378ee50375b039c390ca7f0a29126':
Add secondary external storage support.
2013-10-08 14:12:37 -07:00
Jeff Sharkey
58ff8af53a
am a6af40cd: Merge "Add secondary external storage support." into klp-dev
...
* commit 'a6af40cda29837fb68507f431ee5a179db93de28':
Add secondary external storage support.
2013-10-08 14:09:49 -07:00
Jeff Sharkey
a6af40cda2
Merge "Add secondary external storage support." into klp-dev
2013-10-08 21:05:36 +00:00
Dianne Hackborn
19a6a86ae1
am c35ae6e7: am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
...
* commit 'c35ae6e784dcf1a3480fbcc12e09d51bdffce686':
Wrong argument: handleUnstableProviderDiedLocked
2013-10-08 13:36:53 -07:00
Dianne Hackborn
c35ae6e784
am c739a765: Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
...
* commit 'c739a765981174dc82bf268c379a5c7bc17167f4':
Wrong argument: handleUnstableProviderDiedLocked
2013-10-08 13:33:59 -07:00
Dianne Hackborn
c739a76598
Merge "Wrong argument: handleUnstableProviderDiedLocked" into klp-dev
2013-10-08 20:29:47 +00:00
Alan Viverette
57cc628355
am 76597552: am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
...
* commit '76597552805f810ff7de15f6fad72a0a89ff5724':
Fix HIDE_DESCENDANTS accessibility importance mode
2013-10-08 13:19:31 -07:00
Alan Viverette
7659755280
am 3a407fad: Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
...
* commit '3a407fad3554fe9567bb8769b060233b3efc0633':
Fix HIDE_DESCENDANTS accessibility importance mode
2013-10-08 13:16:38 -07:00
Alan Viverette
3a407fad35
Merge "Fix HIDE_DESCENDANTS accessibility importance mode" into klp-dev
2013-10-08 20:14:21 +00:00
Daniel Sandler
4be3db7018
am f3a56199: am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev
...
* commit 'f3a56199a526bb21f4196e35a355d8476e4604ce':
Don't wake users up with low battery sounds.
2013-10-08 13:07:53 -07:00
Daniel Sandler
d78b94a96b
am 59089be1: am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev
...
* commit '59089be16eb398647b46c40324ae32de4f7d8736':
Out with the sliders, in with the cog.
2013-10-08 13:07:49 -07:00
Daniel Sandler
f3a56199a5
am 40bacdf4: Merge "Don\'t wake users up with low battery sounds." into klp-dev
...
* commit '40bacdf4843ac227b8a19cea47f4424138c8490f':
Don't wake users up with low battery sounds.
2013-10-08 13:05:14 -07:00
Daniel Sandler
59089be16e
am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev
...
* commit 'cd85db331dd319d63f57f7b4c942bc506606b5b0':
Out with the sliders, in with the cog.
2013-10-08 13:05:11 -07:00
Daniel Sandler
40bacdf484
Merge "Don't wake users up with low battery sounds." into klp-dev
2013-10-08 20:03:06 +00:00
Daniel Sandler
cd85db331d
Merge "Out with the sliders, in with the cog." into klp-dev
2013-10-08 20:02:49 +00:00
Jeff Sharkey
44cbdec292
Add secondary external storage support.
...
When SECONDARY_STORAGE is defined by the hardware configuration,
include those paths in the new getExternalCacheDirs() and
getExternalFilesDirs() APIs. Give secondary volumes valid state
until vold reports back.
Bug: 10330128, 10330229
Change-Id: Ifa55bfda47fd7c750f462dd26c98792ad462ab91
2013-10-08 12:57:11 -07:00
Michael Jurka
33c493e653
Wallpaper cropper should inherit translucent theme
...
Change-Id: Icd13130d6250759c71ef016f62d10d7359cf067e
2013-10-08 12:47:22 -07:00
You Kim
bc74de6722
Wrong argument: handleUnstableProviderDiedLocked
...
mProvider is HashMap<ProviderKey, ProviderClientRecord>. String
is not correct object for KEY. Complete removal using iterator.
Bug: 11086495
Change-Id: I51e4576544ef02ede6f96938689dd4e43ec6eb4f
2013-10-08 12:22:30 -07:00
Svetoslav
53e8a26d61
Fix a crash in the select printers activity.
...
When the search view is attached and detached we announce that
for accessibility. The trouble is that if the activity is being
torn down we are trying to access resources from a fragment that
is detached and the qcrash occurs. This change does not try to
access resources if the activity is finishing and also we do not
load resource strings if accessibility is not enabled.
bug:11127814
Change-Id: I4a47a8ed3b6a13544cf17b4395560246a33f0e2d
2013-10-08 12:05:24 -07:00
Jim Miller
674d72220a
am d00284c3: am c23ee579: Merge "Disable dragging the challenge area when there are no widgets" into klp-dev
...
* commit 'd00284c3affb40ed7245327e7ec7b08f13c1ba8f':
Disable dragging the challenge area when there are no widgets
2013-10-08 11:43:14 -07:00
Jim Miller
d00284c3af
am c23ee579: Merge "Disable dragging the challenge area when there are no widgets" into klp-dev
...
* commit 'c23ee579ac21f1f67a30d75e8ac7cbd49ba2fe7d':
Disable dragging the challenge area when there are no widgets
2013-10-08 11:40:09 -07:00
John Spurlock
5736b6d3d3
am 2bef87cc: am 4268600f: Merge "Translucent sysui flags affect layout." into klp-dev
...
* commit '2bef87ccc67a0916bf8b9fddd90f4763c0ada3fe':
Translucent sysui flags affect layout.
2013-10-08 11:38:39 -07:00
Jim Miller
c23ee579ac
Merge "Disable dragging the challenge area when there are no widgets" into klp-dev
2013-10-08 18:38:26 +00:00
John Spurlock
2bef87ccc6
am 4268600f: Merge "Translucent sysui flags affect layout." into klp-dev
...
* commit '4268600f39ff8cf19dcb84c7e13f4c208a8e8127':
Translucent sysui flags affect layout.
2013-10-08 11:36:39 -07:00
John Spurlock
4268600f39
Merge "Translucent sysui flags affect layout." into klp-dev
2013-10-08 18:34:57 +00:00
Daniel Sandler
dea6462aab
Don't wake users up with low battery sounds.
...
Battery sounds will always play when the screen is on, and
then for Settings.Global.LOW_BATTERY_SOUND_TIMEOUT
milliseconds after the screen goes off. After that, low
battery alerts will be pushed out the airlock until the
screen comes back on again.
If battery sounds are suppressed via this mechanism you'll
see a log line like:
V/PowerUI ( 3161): screen off too long (5779ms, limit
5000ms): not waking up the user with low battery sound
The default value of LOW_BATTERY_SOUND_TIMEOUT is a settings
provider resource: R.integer.def_low_battery_sound_timeout.
Bug: 10487557
Change-Id: Iddd42038aa630631dc8f1833f20fcc5a0c646681
2013-10-08 17:37:06 +00:00
Chris Craik
df9472996a
am 2b126b6c: am 46ec729a: Merge "Clean up unused resources" into klp-dev
...
* commit '2b126b6c403d107974477654de223fa1ea8941fe':
Clean up unused resources
2013-10-08 10:32:07 -07:00
Chris Craik
2b126b6c40
am 46ec729a: Merge "Clean up unused resources" into klp-dev
...
* commit '46ec729a88079d3878a95a57ab703e64638dfc1a':
Clean up unused resources
2013-10-08 10:29:29 -07:00
Daniel Sandler
9f6ed15b7a
Out with the sliders, in with the cog.
...
Bug: 11103061
Change-Id: I58895c426f76f81148e4b0b08115c85f40debf6a
2013-10-08 13:27:33 -04:00