Commit Graph

4773 Commits

Author SHA1 Message Date
Fabrice Di Meglio
90bfe0cf7e am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
  Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
2014-07-28 23:15:47 +00:00
Fabrice Di Meglio
d197608e83 Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev 2014-07-28 22:45:16 +00:00
Fabrice Di Meglio
1d5b910f1c Fix bug #14323097 Launching Security from Settings search results
...show header as Settings instead of Security

- add missing title to a few fragments

Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
2014-07-28 15:47:21 -07:00
Jeff Davidson
92126c1c9c am 6207391a: Fix strings for Wi-Fi Assistant dialog.
* commit '6207391ac240d130194f1a0cad7b5f10535d45ac':
  Fix strings for Wi-Fi Assistant dialog.
2014-07-28 20:41:15 +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
7359836b01 am 069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev
* commit '069ed0a678dca7a00fb236ed3ba5e54ea4ee2905':
  Minor character limit fixes for translation.
2014-07-28 18:43:47 +00:00
PauloftheWest
0314d6d694 am 76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev
* commit '76c70b07270f3e0bea5e94f172d5115c8dffef12':
  Fixed minor character limits for translation.
2014-07-28 17:49:35 +00:00
Alexandra Gherghina
3f0140ec4d am 28ff0ff0: Update string displayed when we can\'t remove an account
* commit '28ff0ff0f19b3ef2a665d72020509d106bf6e73f':
  Update string displayed when we can't remove an account
2014-07-28 14:29:59 +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
5573c5e3cd am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
  Increase string lengths for translation
2014-07-27 11:30:12 +00:00
Amith Yamasani
ee4e67aa27 am 1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
* commit '1a77577da755b0921a3b77fc66ff9b99b50b59f6':
  Change tablet to device so it doesn't say tablet on a phone
2014-07-26 23:57:25 +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
44a0acfcb6 am 247520c3: More User Settings improvements
* commit '247520c369370885a1c085e53ee679dce0fd55ce':
  More User Settings improvements
2014-07-26 14:16:15 +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
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
869d18af2d am 06363397: Remove -opia color correction modes
* commit '063633971283a2dd342fc032d3cef65d03de0125':
  Remove -opia color correction modes
2014-07-25 19:46:56 +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
Paul Lawrence
54579a9ef3 am 0ee45d5b: Fix Trusted Credentials layout
* commit '0ee45d5bdc559ba7746dc803429268e8b6dd2092':
  Fix Trusted Credentials layout
2014-07-25 18:47:41 +00:00
Paul Lawrence
0ee45d5bdc Fix Trusted Credentials layout
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape

Bug: 16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
2014-07-25 18:20:52 +00:00
Fabrice Di Meglio
48aad31457 am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
* commit '8610ff9ea678201920bf6fb7d3a2b141226f6640':
  Fix Preferences background color
2014-07-25 03:03:43 +00:00
Fabrice Di Meglio
1bf89b742d Fix Preferences background color
- use #FFFAFAFA instead of pure white

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

Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
2014-07-24 17:03:04 -07:00
Fabrice Di Meglio
a757b61ec9 am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
* commit 'a8469d285e1956e2a90a4475ad6e5981dee34223':
  More fixes for QuickLaunchSettings
2014-07-24 23:23:55 +00:00
rich cannings
0ed8633fed am b8684d57: Remove "Verify apps" from Security settings
* commit 'b8684d573e1357ee573f26d511a630b39e368d0f':
  Remove "Verify apps" from Security settings
2014-07-24 22:47:13 +00:00
Fabrice Di Meglio
e20e169bbe More fixes for QuickLaunchSettings
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme

Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
2014-07-24 15:46:35 -07: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
Fabrice Di Meglio
8610ff9ea6 Merge "Fix Preferences background color" into lmp-dev 2014-07-24 22:06:48 +00:00
Paul Lawrence
4ea43465fa am 832ad720: Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
* commit '832ad7206299be6db94e82e2387c0fcf8df53e7e':
  Show countdown of remaining decrypt attempts before wiping device
2014-07-24 21:52:43 +00:00
Baligh Uddin
c3bd8097d8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-24 20:48:02 +00:00
Baligh Uddin
1de9e58b20 Import translations. DO NOT MERGE
Change-Id: Icc3bdff4feb649defa6e44414fb07663054eb753
Auto-generated-cl: translation import
2014-07-24 21:44:52 +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
2c27602438 am 468d3916: Implement the Usage Access Settings UI
* commit '468d39160fd417cf23cba3d592acb349d3f59c55':
  Implement the Usage Access Settings UI
2014-07-24 20:30:37 +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
PauloftheWest
742dd6d406 am 28fc05a1: Merge "Added SIM Card Activity to Settings" into lmp-dev
* commit '28fc05a12bc26c79be697c347dd2930094900744':
  Added SIM Card Activity to Settings
2014-07-24 20:02:57 +00: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
Fabrice Di Meglio
a8469d285e Merge "More fixes for QuickLaunchSettings" into lmp-dev 2014-07-24 15:36:21 +00:00
PauloftheWest
28fc05a12b Merge "Added SIM Card Activity to Settings" into lmp-dev 2014-07-24 15:35:58 +00:00
John Spurlock
384ad06ec0 am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev
* commit 'a8e0a5b5f9a1d9fbade91909d57eb431fed69a86':
  Settings: Add to the zen alarm string.
2014-07-24 15:31:02 +00:00
Paul Lawrence
741bad53a0 am e68f5224: Show correct string when prompting for pattern before encrypting
* commit 'e68f5224e4359aef7f62c94130d5b9b221bee389':
  Show correct string when prompting for pattern before encrypting
2014-07-24 15:15:09 +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
18be821aca am dfd2c6f2: Change wording in keyguard settings menu.
* commit 'dfd2c6f261df4d5de5111524bd6205406d0e72db':
  Change wording in keyguard settings menu.
2014-07-23 23:23:58 +00:00
Jim Miller
dfd2c6f261 Change wording in keyguard settings menu.
Fixes bug 15167729

Change-Id: Ie748b25667de3d237da34fc9b6a7bedad3ae1dcc
2014-07-23 23:20:33 +00:00
Maurice Lam
7fbde72593 am 56d781b3: Merge "[WifiSetup] Tablet landscape layout" into lmp-dev
* commit '56d781b32b7aad0fb0bb41aae26ce896f1fedfdc':
  [WifiSetup] Tablet landscape layout
2014-07-23 23:03:29 +00:00
Alan Viverette
8f866a5a94 am 68419fca: Merge "Use activity for brightness dialog" into lmp-dev
* commit '68419fca2d03b8c5afd9f5dfecef8a4415ff063d':
  Use activity for brightness dialog
2014-07-23 21:47:04 +00:00
Dianne Hackborn
cc20a5b1fe am f151ea34: Merge "Work on issue #16135174: Apps page "smoke" gradient footer must be removed" into lmp-dev
* commit 'f151ea34824105068ebadae43fe165e79587f9f6':
  Work on issue #16135174: Apps page "smoke" gradient footer must be removed
2014-07-23 21:43:17 +00:00