Commit Graph

14671 Commits

Author SHA1 Message Date
Dianne Hackborn
a08ebdb376 am 81b728cc: am f23885b9: am b763e342: Improve protection against malicious admins.
* commit '81b728ccb8b304acc36210c130ec40a76d9a86bf':
  Improve protection against malicious admins.
2014-07-23 01:44:41 +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
2eea60eb67 am 4fcd6a49: am a9653308: am 7e974f4c: Merge "Reset color space when development options are disabled" into lmp-dev
* commit '4fcd6a49ed297a20ebe6f1f31216743c6eb23b40':
  Reset color space when development options are disabled
2014-07-23 00:37:24 +00: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
c0f5b2747a am 7d726417: am 58c891e8: am 54612391: Settings: Tweak zen alarm info string.
* commit '7d726417af43b9c5bf5fc795a62f4a56d56220ff':
  Settings: Tweak zen alarm info string.
2014-07-23 00:13:12 +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
Jeff Sharkey
661e854434 am d9e82576: am 13948a69: am e65bb492: Merge "Data Usage, materialized!" into lmp-dev
* commit 'd9e825763e2f612f8f3515f958e1e2b4f84d31d5':
  Data Usage, materialized!
2014-07-22 23:53:32 +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
9de00da82f am b29e0751: am ca6d88aa: am 0da1f851: Removed WPA PSK from HotSpot Options
* commit 'b29e0751d3984b8da729587f74aac43168e824bc':
  Removed WPA PSK from HotSpot Options
2014-07-22 23:49:11 +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
5510a9e640 am 3322a5e5: am 26eaa31c: am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
* commit '3322a5e50a3831cf71ae5894a96a69c3151ae033':
  Stop using framework-private switch asset
2014-07-22 23:40:18 +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
d3af3937d6 am 0c634a11: am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
* commit '0c634a11a8a86fe0ccde7ddd839a3b00a34c12fd':
  Add Home / Launcher apps indexing
2014-07-22 22:29:11 +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
Alexandra Gherghina
b381275989 am ec765ce1: am 534b84e9: am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""
* commit 'ec765ce1127c4419fb71a0b1d90053e19d0b7f38':
  Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:55:33 +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
a2b423094e am 22cbe6b7: am badae7d8: am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
* commit '22cbe6b7354579add5e4e0ba6edd30cb5987d1fd':
  Settings: No really, keep the trailing space.
2014-07-22 19:38:18 +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
e10bb11144 am d00a99d7: am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler
* commit 'd00a99d710457993ca3fbd8142df789280d33107':
  Use SwitchPreference for input method subtype enabler
2014-07-22 17:46:42 +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
14bfedca72 am 9ddc7821: am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
* commit '9ddc782101b2df3f418b0b5e1b36c561772b6ecd':
  Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:42:25 +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
Baligh Uddin
53514a8df0 am 615843b7: (-s ours) am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE
* commit '615843b7316ad0c902daa840381059c97fb4af27':
  Import translations. DO NOT MERGE
2014-07-22 17:32:48 +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
04c5b35d6e Import translations. DO NOT MERGE
Change-Id: Ie683e8b74d9ca12391a9c48713a7d736efc4a338
Auto-generated-cl: translation import
2014-07-22 17:08:22 +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