Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,200 Commits 1 Branch 0 Tags
47c6afde7f86a6fca1f94de374ae6d5ecae9dade
Commit Graph

3781 Commits

Author SHA1 Message Date
John Spurlock
8ef00dfe4b Settings: Fix ordering for interruptions alarm warning. 
And update the string to the latest.

Bug:16662819
Change-Id: I42b38ab4721180babfd816a34a1fb1c368546cca
 2014-07-30 12:33:04 -04:00
Alexandra Gherghina
b4df7f3cc4 am ecd1fac9: am 6d09e061: am 4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev 
* commit 'ecd1fac93d6a1b6fa994d445fe7828b63a255362':
  Move global sync settings dialogs to the right screen
 2014-07-29 15:39:26 +00:00
Zoltan Szatmary-Ban
267b103348 am 7832c091: am b77ef9be: am 74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev 
* commit '7832c0913db9fa9cabdb3f78d6b6f54467798de5':
  Update Data Usage Settings for Enterprise
 2014-07-29 13:32:11 +00:00
Jeff Davidson
a117f13337 am 2eb61429: am 92126c1c: am 6207391a: Fix strings for Wi-Fi Assistant dialog. 
* commit '2eb61429f8593cc9b1dda6b1714e784d4c624c11':
  Fix strings for Wi-Fi Assistant dialog.
 2014-07-28 20:54:25 +00:00
Jeff Davidson
6207391ac2 Fix strings for Wi-Fi Assistant dialog. 
Remove some redundant strings that are no longer needed.

Change-Id: I039839989358efa322bac13129d91f7c764fd387
 2014-07-28 13:35:41 -07:00
PauloftheWest
a4cfc0f386 am 57043d83: am 7359836b: am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev 
* commit '57043d837e2a41dc6b8ae9c9bfe5dab95dd5441c':
  Minor character limit fixes for translation.
 2014-07-28 18:52:25 +00:00
PauloftheWest
27ac35f542 am bc83acc2: am 0314d6d6: am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev 
* commit 'bc83acc2ede2ea255a5d0c3fb280aaf5c51b389e':
  Fixed minor character limits for translation.
 2014-07-28 18:07:37 +00:00
Alexandra Gherghina
bb4b982efe am 0d05a314: am 3f0140ec: am 28ff0ff0: Update string displayed when we can\'t remove an account 
* commit '0d05a3145af8a612847ea9fbd26c3236c8cb07c6':
  Update string displayed when we can't remove an account
 2014-07-28 14:37:19 +00:00
Alexandra Gherghina
28ff0ff0f1 Update string displayed when we can't remove an account 
Bug: 14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d
 2014-07-28 15:24:34 +01:00
Amith Yamasani
af25bacd53 am 6b913056: am 5573c5e3: am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev 
* commit '6b9130569af25d3ada71dc8268b21c15e62ee2d4':
  Increase string lengths for translation
 2014-07-27 11:49:14 +00:00
Amith Yamasani
fbd4da78ec am b92d97ed: am ee4e67aa: am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone 
* commit 'b92d97ed8fcdf66b0276e9f5b74cba1f4837659b':
  Change tablet to device so it doesn't say tablet on a phone
 2014-07-27 00:04:02 +00:00
Amith Yamasani
1a77577da7 Change tablet to device so it doesn't say tablet on a phone 
Bug: 16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552
 2014-07-26 16:47:00 -07:00
Amith Yamasani
1d54c06a24 am de2ead8f: am 44a0acfc: am 247520c3: More User Settings improvements 
* commit 'de2ead8f67c0b7f6f053e428044b0862baeae75e':
  More User Settings improvements
 2014-07-26 14:22:32 +00:00
Amith Yamasani
247520c369 More User Settings improvements 
Add a menu checkbox to allow creation of users from lockscreen.
Add a delete icon in restricted profiles settings.
Other little fixes to icons.
Update some strings based on feedback.

Bug: 15761405
Bug: 16550371
Bug: 16298824

Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
 2014-07-26 14:09:43 +00:00
Amith Yamasani
b8e0f608cf Implement SET_PROFILE_OWNER intent 
This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.

Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.

Also, make sure that profile owners cannot be deactivated.

Bug: 16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
 2014-07-29 13:50:40 -07:00
Amith Yamasani
bed3a7b6aa Merge "Increase string lengths for translation" into lmp-dev 2014-07-25 21:16:23 +00:00
Amith Yamasani
1a4c1b080c Increase string lengths for translation 
Bug: 16062154
Change-Id: Ib0086f23283f324a18f71ec5f8bab9275567c59f
 2014-07-26 22:54:40 -07:00
Alan Viverette
29850a82d0 am ab01ab4c: am 869d18af: am 06363397: Remove -opia color correction modes 
* commit 'ab01ab4c4df86c8106f7806c9afde8e2c5ae92bc':
  Remove -opia color correction modes
 2014-07-25 19:54:21 +00:00
Alan Viverette
0636339712 Remove -opia color correction modes 
The implementations for these are identical to -omaly modes.

Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
 2014-07-25 19:41:04 +00:00
rich cannings
adc92594d4 am c642e3d9: am 0ed8633f: am b8684d57: Remove "Verify apps" from Security settings 
* commit 'c642e3d915ba649702bddd9b6fe60d9210d0ccd0':
  Remove "Verify apps" from Security settings
 2014-07-24 23:41:32 +00:00
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
rich cannings
b8684d573e Remove "Verify apps" from Security settings 
The setting moved to Google settings

Bug: 15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
 2014-07-24 15:13:23 -07: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
PauloftheWest
069ed0a678 Merge "Minor character limit fixes for translation." into lmp-dev 2014-07-24 15:37:54 +00:00
PauloftheWest
580362d30b Minor character limit fixes for translation. 
Change-Id: I3fdaba305884d961d28c0d22b647b371680e2d52
 2014-07-28 11:35:41 -07:00
PauloftheWest
4b26513ff8 Fixed minor character limits for translation. 
Change-Id: Ie2d343234a4672f832a9a1d58c790d70d3b47987
 2014-07-28 10:34:04 -07:00
PauloftheWest
76c70b0727 Merge "Fixed minor character limits for translation." into lmp-dev 2014-07-24 15:37:54 +00:00
Zoltan Szatmary-Ban
0924f199e5 Update Data Usage Settings for Enterprise 
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834
Change-Id: I80cdcc062e45e1d2a8077f033562d71217e262bb
 2014-07-29 11:10:45 +01:00
Alexandra Gherghina
5ceddfaaf5 Move global sync settings dialogs to the right screen 
Bug: 16076571
Change-Id: I4ba01ece6e5054d699342ff2c1270fc2fc51c5a9
 2014-07-29 16:19:26 +01: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