Commit Graph

14476 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Adrian Roos
4c177cbd18 am 2c22d6d2: Fix and simplify advanced security settings layout
* commit '2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
  Fix and simplify advanced security settings layout
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
c58595f225 am 4869faf4: Revert "Move global sync settings to AccountSettings."
* commit '4869faf46559c54a34b969b5ae5391a208e723af':
  Revert "Move global sync settings to AccountSettings."
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
761dad7901 am 64fde6f4: Move global sync settings to AccountSettings.
* commit '64fde6f4e9404a363f577a9fda424affcb5138e4':
  Move global sync settings to AccountSettings.
2014-07-22 13:36:38 +00:00
Dianne Hackborn
fb420af379 am ff795ffb: Unify voice interactor and recognizer settings.
* commit 'ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4':
  Unify voice interactor and recognizer settings.
2014-07-22 12:18:00 +00:00
Adrian Roos
2c22d6d204 Fix and simplify advanced security settings layout
Provides correct padding for tablets and sets background
drawable.

Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
2014-07-22 12:08:44 +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
794fb56fa4 am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
* commit 'f6f1e2ba1382617cc4df76a004a0da4313a59129':
  Remove fake 8dp padding on N7 devices
2014-07-22 02:21:52 +00:00
Fabrice Di Meglio
f0b952d045 Remove fake 8dp padding on N7 devices
- was a remaining artifact from a test

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Ib39166213bb76ceb2319b21cb3651e7c43c4de68
2014-07-21 19:11:06 -07:00
Fabrice Di Meglio
f2c1502f52 am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev
* commit '65e89f6ecfcf54cc0b8ac17e698bb422dd12e654':
  Add the capability to set a pinned header to a ListFragment
2014-07-22 00:32:53 +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
84202957f7 am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev
* commit 'dd9dcb43778437358847e57c05c6926e42e47c62':
  Treat caption preview viewport as clipped 16:9 aspect
2014-07-22 00:12:40 +00:00
Alan Viverette
32cc3b89b4 am c94e7e61: Merge "Remove inversion quick settings toggle" into lmp-dev
* commit 'c94e7e611cd4cacdcc4ae7297a476024a4ba3b5c':
  Remove inversion quick settings toggle
2014-07-21 23:55:51 +00:00
Fabrice Di Meglio
10abcdcba1 am aed4c728: Merge "Add the capability to set a pinned header to SettingsPreferenceFragment" into lmp-dev
* commit 'aed4c7284ecdeb4353da0b5a90c11e2f598d733a':
  Add the capability to set a pinned header to SettingsPreferenceFragment
2014-07-21 23:26:47 +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
235d64cf5e am 40aeac90: Merge "Remove unused and unnecessary code from subtype enabler" into lmp-dev
* commit '40aeac90f10c7ab6bd52e7200513b2eda7129904':
  Remove unused and unnecessary code from subtype enabler
2014-07-21 22:29:50 +00:00
Amith Yamasani
05a10c6088 am fca31ca4: Follow API change from *Blocked to *Hidden
* commit 'fca31ca418ec9c8d09efd18d7616b816a3e9f94a':
  Follow API change from *Blocked to *Hidden
2014-07-21 22:25:17 +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
c8c4b092e9 am fecda618: Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
* commit 'fecda6181dcb4197268fd9846cf01207f5ae3249':
  Fix Notification Access layout for tabletUI support
2014-07-21 20:52:35 +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
a59776860d am 193cd11c: Merge "Fix App Notification layout for tabletUI support" into lmp-dev
* commit '193cd11c4b52e313422b74fec46c792aec9a9c06':
  Fix App Notification layout for tabletUI support
2014-07-21 20:28:07 +00:00
Fabrice Di Meglio
7bc9c1bce3 Fix App Notification layout for tabletUI support
- setup correct padding for the App list and its item

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I6c14bb8abced59b636a3230e1daf783130f0f4d3
2014-07-21 13:19:06 -07:00
Fabrice Di Meglio
edfe312d6d am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
* commit '592a17aa3c1c88b576a1b342135fcf3f566bd9e4':
  Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
2014-07-21 18:31:39 +00:00