Narayan Kamath
59c3da2367
Get rid of duplicated code in accessibility settings.
...
Has the side effect of picking up changes to LocalePicker
that added support for 3 letter language codes.
bug: 10090157
(cherry picked from commit 26edbccb58
)
Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
2014-07-23 11:10:16 +01:00
Alan Viverette
ac029dbeb3
am 5329be99
: am b125caa7
: Merge "Remove dialog icons" into lmp-dev
...
* commit '5329be99895530134796cfbbd510ba7fc4457182':
Remove dialog icons
2014-07-23 02:01:21 +00:00
Alan Viverette
5329be9989
am b125caa7
: Merge "Remove dialog icons" into lmp-dev
...
* commit 'b125caa7ed29f1ecf5062452191d061fa890decb':
Remove dialog icons
2014-07-23 01:56:41 +00:00
John Spurlock
a7a0c9a51f
am 06a7fed9
: am ff941af7
: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
...
* commit '06a7fed9c474d44c21074f9884ef637f7c2cf860':
Settings: Disable Interruptions > From when N/A.
2014-07-23 01:53:15 +00:00
John Spurlock
06a7fed9c4
am ff941af7
: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
...
* commit 'ff941af733a86c4b9fdf1f7f23ac6405faf73231':
Settings: Disable Interruptions > From when N/A.
2014-07-23 01:45:38 +00:00
Dianne Hackborn
81b728ccb8
am f23885b9
: am b763e342
: Improve protection against malicious admins.
...
* commit 'f23885b92f8b80f55b17fe4072ca8ede9caadcd4':
Improve protection against malicious admins.
2014-07-23 01:39:46 +00:00
Dianne Hackborn
f23885b92f
am b763e342
: Improve protection against malicious admins.
...
* commit 'b763e34210e3947b46ef7c9bf396579f17ab0daf':
Improve protection against malicious admins.
2014-07-23 01:35:53 +00:00
Dianne Hackborn
b763e34210
Improve protection against malicious admins.
...
- 2 second timeout until we give up on displaying a message,
keeping us within the 5 second activity launch block time.
- Restart the activity launch block when we show the dialog.
- Use app ops to prevent the app of the currently displayed
admin from putting windows on top while the settings screen
is running.
Change-Id: I631e8896ec7539c2de3ff36f183e67e36bcc37ca
2014-07-22 18:30:26 -07:00
Alan Viverette
4fcd6a49ed
am a9653308
: am 7e974f4c
: Merge "Reset color space when development options are disabled" into lmp-dev
...
* commit 'a9653308e4001150191e0107ceffe7bfd3abf88b':
Reset color space when development options are disabled
2014-07-23 00:33:20 +00:00
Alan Viverette
a9653308e4
am 7e974f4c
: Merge "Reset color space when development options are disabled" into lmp-dev
...
* commit '7e974f4c8428b889a45e46aa32832e68c5173f3d':
Reset color space when development options are disabled
2014-07-23 00:27:41 +00:00
John Spurlock
7d726417af
am 58c891e8
: am 54612391
: Settings: Tweak zen alarm info string.
...
* commit '58c891e8ba5bd927c7f85ebe7abe4dad81f16769':
Settings: Tweak zen alarm info string.
2014-07-23 00:10:18 +00:00
John Spurlock
58c891e8ba
am 54612391
: Settings: Tweak zen alarm info string.
...
* commit '54612391878a2300fc44ea3f4befc171b3d5e737':
Settings: Tweak zen alarm info string.
2014-07-22 23:57:05 +00:00
John Spurlock
5461239187
Settings: Tweak zen alarm info string.
...
Use standard styling and remove the bit about timers.
Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
2014-07-22 19:51:40 -04:00
Jeff Sharkey
d9e825763e
am 13948a69
: am e65bb492
: Merge "Data Usage, materialized!" into lmp-dev
...
* commit '13948a69f4c68b38ff46f7cc3127ddbfffbf00aa':
Data Usage, materialized!
2014-07-22 23:49:25 +00:00
PauloftheWest
b29e0751d3
am ca6d88aa
: am 0da1f851
: Removed WPA PSK from HotSpot Options
...
* commit 'ca6d88aac96171adab56d51cea9bc315c9966948':
Removed WPA PSK from HotSpot Options
2014-07-22 23:45:14 +00:00
Jeff Sharkey
13948a69f4
am e65bb492
: Merge "Data Usage, materialized!" into lmp-dev
...
* commit 'e65bb4927faf8e353c73b58648e51a8081615dcf':
Data Usage, materialized!
2014-07-22 23:44:38 +00:00
PauloftheWest
ca6d88aac9
am 0da1f851
: Removed WPA PSK from HotSpot Options
...
* commit '0da1f8515a6af368a923cc99e5435795a031692a':
Removed WPA PSK from HotSpot Options
2014-07-22 23:40:20 +00:00
Alan Viverette
3322a5e50a
am 26eaa31c
: am 47d27bd6
: Merge "Stop using framework-private switch asset" into lmp-dev
...
* commit '26eaa31cf100f22050bee0780264a3e6c40c1dac':
Stop using framework-private switch asset
2014-07-22 23:33:44 +00:00
PauloftheWest
0da1f8515a
Removed WPA PSK from HotSpot Options
...
Bug: 16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
2014-07-22 23:31:27 +00:00
Alan Viverette
26eaa31cf1
am 47d27bd6
: Merge "Stop using framework-private switch asset" into lmp-dev
...
* commit '47d27bd629838ded2d217f238b6e3b21d18485da':
Stop using framework-private switch asset
2014-07-22 23:25:38 +00:00
Fabrice Di Meglio
0c634a11a8
am 4ad8602a
: am 3f3426e0
: Merge "Add Home / Launcher apps indexing" into lmp-dev
...
* commit '4ad8602ac358672f7f1b162930eccb7e96e223f5':
Add Home / Launcher apps indexing
2014-07-22 22:24:58 +00:00
Fabrice Di Meglio
4ad8602ac3
am 3f3426e0
: Merge "Add Home / Launcher apps indexing" into lmp-dev
...
* commit '3f3426e0d95aed9ab651a703a3a7e33833cd4741':
Add Home / Launcher apps indexing
2014-07-22 22:20:39 +00:00
Fabrice Di Meglio
d73045db7a
Add Home / Launcher apps indexing
...
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too
- also code cleaning for DynamicIndexableContentMonitor
See bug: #16484927 Add "launcher" as a synonym for "home" in settings search
Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
2014-07-22 15:13:54 -07:00
Alan Viverette
b125caa7ed
Merge "Remove dialog icons" into lmp-dev
2014-07-22 22:02:55 +00:00
Alan Viverette
54ccaf6f77
Remove dialog icons
...
BUG: 16493564
Change-Id: I35ec0a8fc6ce3148b5bf469bfd2b56d0ae6d95ee
2014-07-22 18:40:48 -07:00
John Spurlock
ff941af733
Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev
2014-07-22 22:02:49 +00:00
John Spurlock
de99ccf18b
Settings: Disable Interruptions > From when N/A.
...
Bug:16486621
Change-Id: Id720337905051a11ca95fac53f89963495998924
2014-07-22 21:40:41 -04:00
Julia Reynolds
baffc88924
Merge "Lockdown 'remove user' with user restriction in Settings for phones." into lmp-dev
2014-07-22 21:50:21 +00:00
Alexandra Gherghina
ec765ce112
am 534b84e9
: am 6d839875
: Revert "Revert "Move global sync settings to AccountSettings.""
...
* commit '534b84e9f834b366a6fdccfe9f968c1b045f1377':
Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:47:30 +00:00
Alexandra Gherghina
534b84e9f8
am 6d839875
: Revert "Revert "Move global sync settings to AccountSettings.""
...
* commit '6d839875b74f1570e8807005c586298beb677413':
Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:39:17 +00:00
Jeff Sharkey
e65bb4927f
Merge "Data Usage, materialized!" into lmp-dev
2014-07-22 20:40:07 +00:00
Jeff Sharkey
b654846300
Data Usage, materialized!
...
Asset drop so Data Usage matches new Material spec. Removes time
dimension sweeps, so we now summarize the entire visible axis. Fix
time axis labels to not draw outside clip bounds. Remove pie chart.
No more checkboxes in menus. Telephony items like roaming are moved
back to cellular settings. Start wiring up multi-SIM support.
Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
2014-07-22 16:24:37 -07:00
Alan Viverette
47d27bd629
Merge "Stop using framework-private switch asset" into lmp-dev
2014-07-22 20:33:22 +00:00
Alan Viverette
09be4b3c87
Stop using framework-private switch asset
...
BUG: 16467249
Change-Id: I0829c3dea522cf59e0f92046ea7c6092d416ad4c
2014-07-22 16:11:01 -07:00
Alexandra Gherghina
6d839875b7
Revert "Revert "Move global sync settings to AccountSettings.""
...
This reverts commit 4869faf465
.
Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
2014-07-22 20:25:24 +00:00
John Spurlock
22cbe6b735
am badae7d8
: am 59ea80b7
: Merge "Settings: No really, keep the trailing space." into lmp-dev
...
* commit 'badae7d89585d55e7ba9e74d5cbb480f8c446704':
Settings: No really, keep the trailing space.
2014-07-22 19:31:13 +00:00
John Spurlock
badae7d895
am 59ea80b7
: Merge "Settings: No really, keep the trailing space." into lmp-dev
...
* commit '59ea80b781d8c541076f185cfa81084668521ba5':
Settings: No really, keep the trailing space.
2014-07-22 19:26:32 +00:00
Tadashi G. Takaoka
d00a99d710
am 1909e7db
: am 1f539374
: Use SwitchPreference for input method subtype enabler
...
* commit '1909e7db89b80798d13973a60a264687a2420486':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:43:33 +00:00
Tadashi G. Takaoka
1909e7db89
am 1f539374
: Use SwitchPreference for input method subtype enabler
...
* commit '1f53937469095f268d4c7a21d93f821a341a151d':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:37:01 +00:00
Tadashi G. Takaoka
9ddc782101
am 5aa55632
: am 686c2503
: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '5aa556322c672ff112e68019ae9e3396aae20b81':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:34:54 +00:00
Tadashi G. Takaoka
5aa556322c
am 686c2503
: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '686c250323553231f5b314525b221f7000e88572':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:27:20 +00:00
Tadashi G. Takaoka
1f53937469
Use SwitchPreference for input method subtype enabler
...
Bug: 15781377
Change-Id: I80fe987e499722af7768147a184934650bbf8385
2014-07-22 17:22:15 +00:00
Baligh Uddin
615843b731
am 601ce0b9
: (-s ours) am 64a83092
: (-s ours) Import translations. DO NOT MERGE
...
* commit '601ce0b98a18084dce5a0d74a66b20e57297aa55':
Import translations. DO NOT MERGE
2014-07-22 17:22:01 +00:00
Baligh Uddin
601ce0b98a
am 64a83092
: (-s ours) Import translations. DO NOT MERGE
...
* commit '64a830925096f8ca843ae0685dea9d171bd256ee':
Import translations. DO NOT MERGE
2014-07-22 17:14:41 +00:00
Baligh Uddin
64a8309250
Import translations. DO NOT MERGE
...
Change-Id: I9f9207a53b8bc1f312ae7e8c6f4bb3b259dba370
Auto-generated-cl: translation import
2014-07-22 17:04:41 +00:00
Alan Viverette
7e974f4c84
Merge "Reset color space when development options are disabled" into lmp-dev
2014-07-22 16:29:55 +00:00
Alan Viverette
65e00e5ac8
Reset color space when development options are disabled
...
BUG: 16306222
Change-Id: I4939a4fba8b0358333f6ff25ff8c405c5679579d
2014-07-22 11:10:58 -07:00
Fabrice Di Meglio
3f3426e0d9
Merge "Add Home / Launcher apps indexing" into lmp-dev
2014-07-22 16:21:19 +00:00
PauloftheWest
564282a3f4
Merge "Character limit updates" into lmp-dev
2014-07-22 16:13:36 +00:00
PauloftheWest
fb3060378f
Character limit updates
...
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
2014-07-23 10:11:43 -07:00