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
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
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
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
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
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
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
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
Baligh Uddin
c4108655e1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-27 22:35:46 +00:00
Baligh Uddin
8f7b82bec8
Import translations. DO NOT MERGE
...
Change-Id: I9653e86e7b7264646b35675fd40f6d582dc09d58
Auto-generated-cl: translation import
2014-07-28 13:01:38 -07: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
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
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
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
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
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
Fabrice Di Meglio
5c14856ba2
Merge "Fix bug #16306535 The arrows rotate in the opposite direction... of the direction implied by the iconography (clockwise)" into lmp-dev
2014-07-25 23:01:28 +00:00
Fabrice Di Meglio
fb49019855
Fix bug #16306535 The arrows rotate in the opposite direction...
...
of the direction implied by the iconography (clockwise)
- update assets with correct direction
Change-Id: I56ff28cd2207577726b5136191317fae325c1bed
2014-07-29 17:08:41 -07:00
Fabrice Di Meglio
6911f9cf63
Fix bug #16660819 Switchbar text should be white not grey
...
- use "?android:attr/textColorPrimary" so that we are white
and matching the color of the Activity Title
Change-Id: I18bc47d2080fcc171b86e5b56bfc86bbe8637caa
2014-07-29 16:54:44 -07:00
Fabrice Di Meglio
6d9a59f02d
Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev
2014-07-25 23:01:28 +00:00
Svetoslav
0b4cf14400
Merge "Removing lock screen app widget code" into lmp-dev
2014-07-25 23:00:08 +00:00
Svetoslav
528e6c307a
Removing lock screen app widget code
...
This feature is no longer suppored and this change removes
the related code from settings.
Change-Id: I156107740f20b096f44fa2880ef6dcad9f311a73
2014-07-31 01:57:09 +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
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
d8e4b338e4
am 72c677c4: am 54579a9e: am 0ee45d5b: Fix Trusted Credentials layout
...
* commit '72c677c4590b098bf53b3d319fa4d007b5affb76':
Fix Trusted Credentials layout
2014-07-25 19:25:38 +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
a1e01f0e41
am b666f1fd: am 48aad314: am 8610ff9e: Merge "Fix Preferences background color" into lmp-dev
...
* commit 'b666f1fd9062c64b8294bcd19d19e2ff7b0a17e5':
Fix Preferences background color
2014-07-25 03:11:26 +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
71827c78ec
am b0abf33f: am a757b61e: am a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
...
* commit 'b0abf33f6cf617e5854dd801406bc98df4766eb0':
More fixes for QuickLaunchSettings
2014-07-24 23:41:33 +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
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