Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,676 Commits 1 Branch 0 Tags
47ab7fc8f7ab13ee5733adb75cbdfb54970404fa
Commit Graph

6474 Commits

Author SHA1 Message Date
John Spurlock
47ab7fc8f7 am a7a0c9a5: am 06a7fed9: am ff941af7: Merge "Settings: Disable Interruptions > From when N/A." into lmp-dev 
* commit 'a7a0c9a51fb38385ace2d1eb404140a3daad3abe':
  Settings: Disable Interruptions > From when N/A.
 2014-07-23 01:57:23 +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
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
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
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
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
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
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
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
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
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
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
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
b9a8e722fa am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings." 
* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
  Revert "Move global sync settings to AccountSettings."
 2014-07-22 14:14:32 +00:00
Alexandra Gherghina
4443270ad4 am 6c92599f: am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings. 
* commit '6c92599f369fb884a9affa7dcf9fcedcec111257':
  Move global sync settings to AccountSettings.
 2014-07-22 14:14:31 +00:00
Dianne Hackborn
84c94b10ae am a467c341: am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings. 
* commit 'a467c3410a68930b04cfddd890f7ffd71e0dd6ed':
  Unify voice interactor and recognizer settings.
 2014-07-22 13:58:05 +00: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
a2b607e187 am 77d20aab: am f2c1502f: am 65e89f6e: Merge "Add the capability to set a pinned header to a ListFragment" into lmp-dev 
* commit '77d20aab65b0942ed042529c811470e7ff60c1f9':
  Add the capability to set a pinned header to a ListFragment
 2014-07-22 00:43:13 +00: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
85f34c0a3b am 44670421: am 84202957: am dd9dcb43: Merge "Treat caption preview viewport as clipped 16:9 aspect" into lmp-dev 
* commit '4467042128889665004cabe866984e2c1fbd2c85':
  Treat caption preview viewport as clipped 16:9 aspect
 2014-07-22 00:25:34 +00:00