Paul Lawrence
5a67abbbdd
am a6ce40f4: am 4ea43465: am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
...
* commit 'a6ce40f461672fdbfef611bfcc90a7578b18b70c':
Show countdown of remaining decrypt attempts before wiping device
2014-07-24 23:41:30 +00:00
Adam Lesinski
9bac84340b
am 44b0c71d: am 2c276024: am 468d3916: Implement the Usage Access Settings UI
...
* commit '44b0c71d1399ba24c2b85ae3272d97fcc3c854f5':
Implement the Usage Access Settings UI
2014-07-24 23:41:29 +00:00
PauloftheWest
5c416a6bf0
am bd1403f8: am 742dd6d4: am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
...
* commit 'bd1403f85079958132427f523ee738ade98ca0f6':
Added SIM Card Activity to Settings
2014-07-24 23:41:27 +00:00
John Spurlock
159af1cb3f
am 06fbbf6f: am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
...
* commit '06fbbf6f313c161980f2d28d81b19942a9adb306':
Settings: Add to the zen alarm string.
2014-07-24 23:41:25 +00:00
Paul Lawrence
67a588bc43
am 40b8f460: am 741bad53: am e68f5224: Show correct string when prompting for pattern before encrypting
...
* commit '40b8f46072ad242fc420d922cffb83b082e84894':
Show correct string when prompting for pattern before encrypting
2014-07-24 23:41:24 +00:00
Paul Lawrence
832ad72062
Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
2014-07-24 20:48:02 +00:00
Adam Lesinski
468d39160f
Implement the Usage Access Settings UI
...
Scans for apps requesting permission to use the
UsageStats API and displays them so that the user
can grant or deny access.
Bug: 16461070
Change-Id: Ie9f611688581cdd60ffe9f59e566f658ac2564e9
2014-07-24 13:24:19 -07:00
Paul Lawrence
bd4c3210e1
Show countdown of remaining decrypt attempts before wiping device
...
Bug: 16496992
Change-Id: Ibdd4bbbf9a9eeafee5e0e5ed48464d524628cf12
2014-07-24 08:38:24 -07:00
Jim Miller
5d12af524f
am ab2b852c: am 18be821a: am dfd2c6f2: Change wording in keyguard settings menu.
...
* commit 'ab2b852cee8a178097b34d42d5482fecd638414f':
Change wording in keyguard settings menu.
2014-07-24 19:59:52 +00:00
PauloftheWest
28fc05a12b
Merge "Added SIM Card Activity to Settings" into lmp-dev
2014-07-24 15:35:58 +00:00
Paul Lawrence
e68f5224e4
Show correct string when prompting for pattern before encrypting
...
Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
2014-07-24 15:11:16 +00:00
PauloftheWest
3815561997
Added SIM Card Activity to Settings
...
+ Added SIM Card menu to Settings menu
+ Added SIM card detail dialog when selecting a SIM Card
+ Added ability to select the default SIM for Cellular data, Calls, and SMS
Bug: 16241745
Change-Id: I43437aa4c591c5097a8865d564f88726671e1b7d
2014-07-24 06:41:12 -07:00
Jim Miller
dfd2c6f261
Change wording in keyguard settings menu.
...
Fixes bug 15167729
Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
2014-07-23 23:20:33 +00:00
Dianne Hackborn
d2b634110d
am 1c286fbd: am cc20a5b1: am f151ea34: Merge "Work on issue #16135174 : Apps page "smoke" gradient footer must be removed" into lmp-dev
...
* commit '1c286fbdae93ab09edd7493c72c7d8c42d5ce678':
Work on issue #16135174 : Apps page "smoke" gradient footer must be removed
2014-07-23 22:00:14 +00:00
Julia Reynolds
23e921850b
am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings.
...
* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
Use restrictionsprovider framework in Settings.
2014-07-23 22:00:13 +00:00
Julia Reynolds
1a0297c544
Use restrictionsprovider framework in Settings.
...
Bug: 15305103
Change-Id: Ib0147e366fe90de3512d0cc06e2a47ee16012dff
2014-07-23 21:06:21 +00:00
John Spurlock
c3fc2cbf38
am 2daea077: am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
...
* commit '2daea077674caffd34d2022cd4cd37516d919f8c':
Settings: Wire up Display > Lift to wake.
2014-07-23 19:36:14 +00:00
Dianne Hackborn
f151ea3482
Merge "Work on issue #16135174 : Apps page "smoke" gradient footer must be removed" into lmp-dev
2014-07-23 18:44:51 +00:00
Dianne Hackborn
fe9590bb19
Work on issue #16135174 : Apps page "smoke" gradient footer must be removed
...
New header in running services. Not yet done.
Change-Id: Ibe2f4145796c7863ec80e0ea2d8d87dc910bac7e
2014-07-23 13:50:07 -07:00
John Spurlock
a8e0a5b5f9
Merge "Settings: Add to the zen alarm string." into lmp-dev
2014-07-23 18:31:55 +00:00
John Spurlock
1b821ffad4
Settings: Add to the zen alarm string.
...
Bug:16406214
Change-Id: I9112c93fdee847633f9e5fb79129a3b02af4439e
2014-07-24 11:24:18 -04:00
John Spurlock
d39d731473
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
2014-07-23 18:31:55 +00:00
PauloftheWest
ff154d9902
am fc98ff5c: am b6e74d86: am 564282a3: Merge "Character limit updates" into lmp-dev
...
* commit 'fc98ff5c9f160f6e2c754e548b37f73c0a272b4d':
Character limit updates
2014-07-23 17:30:59 +00:00
John Spurlock
333efe9097
Settings: Wire up Display > Lift to wake.
...
Bug:15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
2014-07-23 13:12:50 -04: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
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
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
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
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
Alexandra Gherghina
6d839875b7
Revert "Revert "Move global sync settings to AccountSettings.""
...
This reverts commit 4869faf465
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
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
PauloftheWest
fb3060378f
Character limit updates
...
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
2014-07-23 10:11:43 -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
4869faf465
Revert "Move global sync settings to AccountSettings."
...
This reverts commit 64fde6f4e9
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
Jason Monk
956cc191df
am 08ac9bc6: am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev
...
* commit '08ac9bc6063af2e265964e1c8d650da536af10b7':
Add Screen pinning back to settings
2014-07-21 19:23:46 +00:00
Jason Monk
27d7ea56f3
Add Screen pinning back to settings
...
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.
Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
2014-07-21 09:01:43 -04:00
Adam Lesinski
f174153e84
am 3a2a4720: am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API
...
* commit '3a2a4720c175b0dfacace18bade0f99b09e056f4':
Update Settings to use new UsageStats API
2014-07-20 02:27:45 +00:00
Adam Lesinski
8d7be7b738
Update Settings to use new UsageStats API
...
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
PauloftheWest
2e6e981518
am e25fcbf1: am 72e4a85b: am 772cf206: Merge "Minor string fixes for translation" into lmp-dev
...
* commit 'e25fcbf1f4eebf2aa588522f5d9aa248e77a8e0e':
Minor string fixes for translation
2014-07-18 19:05:05 +00:00
PauloftheWest
772cf20616
Merge "Minor string fixes for translation" into lmp-dev
2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a
Minor string fixes for translation
...
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
2014-07-18 11:04:13 -07:00
Tadashi G. Takaoka
3ac7802ee6
Fix duplicate string resources
...
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
John Spurlock
de42b8b62e
Settings: No really, keep the trailing space.
...
Bug:16487510
Change-Id: Ic10ace9803c7d488240d819427ffec412a10d81a
2014-07-22 15:17:49 -04:00
