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
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
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
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
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
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
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
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
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
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
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
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
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
1f53937469
Use SwitchPreference for input method subtype enabler
...
Bug: 15781377
Change-Id: I80fe987e499722af7768147a184934650bbf8385
2014-07-22 17:22:15 +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
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
Alexandra Gherghina
7258665bd0
am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit 'c58595f22562c25af75ee1c2088abaaed0ac18a4':
Revert "Move global sync settings to AccountSettings."
2014-07-22 13:56:36 +00:00
Alexandra Gherghina
6c92599f36
am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '761dad7901f49e47d8ce5655f77125c7ed428484':
Move global sync settings to AccountSettings.
2014-07-22 13:56:35 +00:00
Dianne Hackborn
a467c3410a
am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'fb420af379a42fa6d8ca5e766fbfa663a321e825':
Unify voice interactor and recognizer settings.
2014-07-22 13:38:43 +00:00
Alexandra Gherghina
4869faf465
Revert "Move global sync settings to AccountSettings."
...
This reverts commit 64fde6f4e9 .
Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9
Move global sync settings to AccountSettings.
...
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.
Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8
Unify voice interactor and recognizer settings.
...
There is now one settings UI to select both the new
voice interactor and old voice recognizer.
There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.
Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
2014-07-21 20:14:43 -07:00
Fabrice Di Meglio
77d20aab65
am f2c1502f: am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
...
* commit 'f2c1502f522da31667781d5f95f22e1532a68cce':
Add the capability to set a pinned header to a ListFragment
2014-07-22 00:38:22 +00:00
Fabrice Di Meglio
e72bb08679
Add the capability to set a pinned header to a ListFragment
...
- add public void setPinnedHeaderView(View pinnedHeader) and
clearPinnedHeaderView() APIs for adding and clearing the pinned header
Change-Id: I1096b418351c0f02a13fd49d4a19e52970125106
2014-07-21 17:25:42 -07:00
Alan Viverette
4467042128
am 84202957: am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
...
* commit '84202957f7570933d89d3956d075bf93777388c2':
Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:20:59 +00:00
Alan Viverette
09a6c93dba
am 32cc3b89: am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
...
* commit '32cc3b89b448863b5057183fb0e0c24b6771e9e8':
Remove inversion quick settings toggle
2014-07-22 00:00:12 +00:00
Fabrice Di Meglio
cc23dff5d7
am 10abcdcb: am aed4c728: Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
...
* commit '10abcdcba155cb3c2a79fd57e4c80be61b018e3a':
Add the capability to set a pinned header to SettingsPreferenceFragment
2014-07-21 23:33:18 +00:00
Fabrice Di Meglio
86159283c9
Add the capability to set a pinned header to SettingsPreferenceFragment
...
- add a FrameLayout into the preference list fragment
- add public void setPinnedHeaderView(View pinnedHeader) and
clearPinnedHeaderView() APIs for adding and clearing the pinned header
Change-Id: I50ba5dd150167e0d49cc54bee1203f46db6d7a66
2014-07-21 16:16:23 -07:00
Tadashi G. Takaoka
c719aba7ee
am 235d64cf: am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
...
* commit '235d64cf5eb30c5d0a57d5225691d6f5322e63e7':
Remove unused and unnecessary code from subtype enabler
2014-07-21 22:36:42 +00:00
Amith Yamasani
749e7eec39
am 05a10c60: am fca31ca4: Follow API change from *Blocked to *Hidden
...
* commit '05a10c6088ae1c87cb1f32263aec8d6c5f2a0006':
Follow API change from *Blocked to *Hidden
2014-07-21 22:32:26 +00:00
Amith Yamasani
fca31ca418
Follow API change from *Blocked to *Hidden
...
Bug: 16191518
Change-Id: I4cbe210e62d551e4d5246eb3a7523d03c41175be
2014-07-21 22:19:09 +00:00
Fabrice Di Meglio
02069663bc
am c8c4b092: am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
...
* commit 'c8c4b092e99fb0349e5da4d58cd68ce55eb0c40d':
Fix Notification Access layout for tabletUI support
2014-07-21 20:56:32 +00:00
Fabrice Di Meglio
20b32f25f0
Fix Notification Access layout for tabletUI support
...
- setup correct padding for the App list and its item
also remove showing FastScroller all the time on App Notification list
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I11a70906f1372027622d50a81bc7744d48190f8a
2014-07-21 13:41:32 -07:00
Fabrice Di Meglio
6076eb0399
am edfe312d: am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
...
* commit 'edfe312d6de9f8adeca58c92b7447cd78a61a444':
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 18:37:01 +00:00
Fabrice Di Meglio
dcf59dd82c
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
...
... and also crash with intent: android.settings.ACTION_OTHER_SOUND_SETTINGS
- add corresponding fragments to the ENTRY_FRAGMENTS array
Change-Id: Ic0c10841dfd7bc87d8573530129290ed172ff608
2014-07-21 11:22:20 -07:00
Fabrice Di Meglio
bc84cffff0
am a02a7be9: am 6d26c173: Merge "Fix AppDetails padding on tablet UI" into lmp-dev
...
* commit 'a02a7be9dd8d56c959b76a1bd3296616f47dd474':
Fix AppDetails padding on tablet UI
2014-07-21 18:06:00 +00:00
Jason Monk
08ac9bc606
am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
...
* commit '77fe5373826508345824927692fea942cf6a828a':
Add Screen pinning back to settings
2014-07-21 17:28:47 +00:00