Zoltan Szatmary-Ban
b0c216d3b9
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
2014-10-01 15:48:00 +00:00
PauloftheWest
797fc45ff6
Fixed a Setting Bluetooth Airplane mode bug.
...
+ This patch moves the switch listeners from setup/teardown of the SwitchBar
to pause/resume of Bluetooth Settings. This prevents Bluetooth from
receiving connect messages while Airplane mode is turning off Bluetooth
(which is what caused Bluetooth to re-enable.)
Bug: 17465951
Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
2014-10-01 08:23:40 -07:00
Maurice Lam
492f872886
am 5fdb8fa4
: am f7b56708
: Merge "[WifiSetup] Update background texture" into lmp-dev
...
* commit '5fdb8fa41d44fe31148f00b6c909f511f11fde52':
[WifiSetup] Update background texture
2014-10-01 15:09:26 +00:00
Svetoslav
e78840ff09
am 42eff3b7
: am 52448442
: Use default encryption password if an accessibility service is enabled.
...
* commit '42eff3b7e695c28c4074f7fd71606fa0ecfe199c':
Use default encryption password if an accessibility service is enabled.
2014-10-01 15:09:25 +00:00
Fabrice Di Meglio
3cc8fe3bcc
am 976aba99
: am fc14e272
: Merge "Update Settings App icons" into lmp-dev
...
* commit '976aba99c8b06676b9e097de74287bb70138c848':
Update Settings App icons
2014-10-01 15:09:24 +00:00
PauloftheWest
8506c37897
am cc6736bf
: am 29aab7a2
: Fixed a Settings crash.
...
* commit 'cc6736bfdee735c236814488a169ee5a7c461f73':
Fixed a Settings crash.
2014-10-01 15:09:24 +00:00
Maurice Lam
5fdb8fa41d
am f7b56708
: Merge "[WifiSetup] Update background texture" into lmp-dev
...
* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
[WifiSetup] Update background texture
2014-10-01 15:03:19 +00:00
Svetoslav
42eff3b7e6
am 52448442
: Use default encryption password if an accessibility service is enabled.
...
* commit '524484426855f814ff1f3189fd5221dd630dbf8c':
Use default encryption password if an accessibility service is enabled.
2014-10-01 15:02:20 +00:00
Fabrice Di Meglio
976aba99c8
am fc14e272
: Merge "Update Settings App icons" into lmp-dev
...
* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
Update Settings App icons
2014-10-01 15:00:30 +00:00
PauloftheWest
cc6736bfde
am 29aab7a2
: Fixed a Settings crash.
...
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
2014-10-01 14:58:41 +00:00
Maurice Lam
f7b567081e
Merge "[WifiSetup] Update background texture" into lmp-dev
2014-10-01 01:54:41 +00:00
Maurice Lam
1e055e8f43
[WifiSetup] Update background texture
...
Bug: 17611097
Change-Id: I75264ecac3b689426500e063a18d687866638a85
2014-09-30 17:09:11 -07:00
Hui Shu
90886b8284
Remove WebView DRP Setting from Developer Settings
...
BUG: 17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
2014-09-30 16:53:36 -07:00
Svetoslav
5244844268
Use default encryption password if an accessibility service is enabled.
...
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.
bug:17671790
Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
2014-09-30 23:03:37 +00:00
Baligh Uddin
29514caa9c
Import translations. DO NOT MERGE
...
Change-Id: I79c53aaccbdec874aa56c457c61e8f5858a42c45
Auto-generated-cl: translation import
2014-09-30 12:59:02 -07:00
Baligh Uddin
8202c7f72d
Import translations. DO NOT MERGE
...
Change-Id: I484b3919be4abf29231049a2e96867b0a8453538
Auto-generated-cl: translation import
2014-09-30 12:51:14 -07:00
Baligh Uddin
73411cb71b
Import translations. DO NOT MERGE
...
Change-Id: I3b6fcec9576d2305d0eb872b9d3d404f4b0556a1
Auto-generated-cl: translation import
2014-09-30 12:47:02 -07:00
Fabrice Di Meglio
fc14e272aa
Merge "Update Settings App icons" into lmp-dev
2014-09-30 19:45:31 +00:00
Zoltan Szatmary-Ban
af0f89ff91
Disambiguate categories in Settings > Trusted Credentials
...
Use fixed category names (e.g. 'Personal' and 'Work') on Trusted Credentials
screen instead of names of profiles that may be the same (or similar) for both.
Bug: 17629895
Change-Id: I25b39310f7b9f445d2724be046a16cc82f5d1a9a
2014-09-30 16:30:07 +01:00
Fabrice Di Meglio
85f76f3a7d
Update Settings App icons
...
Per UX request
See bug: #17703962 update Settings app icons
Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a
2014-09-29 19:17:56 -07:00
PauloftheWest
29aab7a2ad
Fixed a Settings crash.
...
+ When in Settings->More... we will no longer provide a tethering option
if tethering requires provisioning, but the provisioning app is invalid.
Bug: 17671381
Change-Id: I48a8178865a7ffddec714c1f6ee6f18d34801b60
2014-09-29 14:58:27 -07:00
Baligh Uddin
02e6f6115b
am 6cbdf17e
: (-s ours) am 5c664d8e
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '6cbdf17e7b8244601174295d2ddeb333c073cfc4':
Import translations. DO NOT MERGE
2014-09-29 20:50:31 +00:00
PauloftheWest
c4ef9bf824
am dc5f87ff
: am 709ddd5c
: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit 'dc5f87fffceac79169fe546055f2ecc3a4142bfe':
Fixed multiple MAP issues.
2014-09-29 20:50:30 +00:00
Baligh Uddin
6cbdf17e7b
am 5c664d8e
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
Import translations. DO NOT MERGE
2014-09-29 20:41:53 +00:00
PauloftheWest
dc5f87fffc
am 709ddd5c
: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
Fixed multiple MAP issues.
2014-09-29 20:41:53 +00:00
Baligh Uddin
5c664d8e20
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 16:37:22 +00:00
PauloftheWest
709ddd5c24
Merge "Fixed multiple MAP issues." into lmp-dev
2014-09-29 15:10:23 +00:00
Baligh Uddin
a69eafa6c8
Import translations. DO NOT MERGE
...
Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import
2014-09-29 00:31:03 -07:00
Robert Greenwalt
20371b52c4
am 613620df
: am ce77a43a
: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
...
* commit '613620df13f01c9871a71c83e4df8cc58031478e':
ATT Entitlement changes in Settings to pass Tether Type.
2014-09-27 00:18:16 +00:00
Robert Greenwalt
613620df13
am ce77a43a
: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
...
* commit 'ce77a43abfb05ee6011ebf6e5ced8dd11e163dcf':
ATT Entitlement changes in Settings to pass Tether Type.
2014-09-27 00:13:17 +00:00
Robert Greenwalt
ce77a43abf
Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
2014-09-27 00:09:02 +00:00
Elliott Hughes
38c42ec165
am 66392541
: am ed6a6ca0
: Make the system locale available to the decryption UI.
...
* commit '66392541346505eaa4825323bb4ba28f55f1d136':
Make the system locale available to the decryption UI.
2014-09-26 23:03:52 +00:00
Elliott Hughes
6639254134
am ed6a6ca0
: Make the system locale available to the decryption UI.
...
* commit 'ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
Make the system locale available to the decryption UI.
2014-09-26 22:58:34 +00:00
Elliott Hughes
ed6a6ca026
Make the system locale available to the decryption UI.
...
Bug: 17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
2014-09-26 15:17:35 -07:00
Rohit Sisodia
37155e9633
ATT Entitlement changes in Settings to pass Tether Type.
...
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.
Bug:17640036
Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
2014-09-26 15:09:03 -07:00
Alexandra Gherghina
e5e430849c
am 8ea6cbf7
: am 9de68440
: Merge "Match parent width for user spinner to fix tint" into lmp-dev
...
* commit '8ea6cbf7d9a6f92bb76564c281597341b0ad1ebb':
Match parent width for user spinner to fix tint
2014-09-26 20:11:30 +00:00
Alexandra Gherghina
5dab2fd3b2
am c7611429
: am 3c3ceb9d
: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
...
* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
Use plain user icon in UserSpinnerAdapter
2014-09-26 20:11:29 +00:00
Alexandra Gherghina
8ea6cbf7d9
am 9de68440
: Merge "Match parent width for user spinner to fix tint" into lmp-dev
...
* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
Match parent width for user spinner to fix tint
2014-09-26 19:55:28 +00:00
Alexandra Gherghina
c7611429e9
am 3c3ceb9d
: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
...
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter
2014-09-26 19:55:27 +00:00
Alexandra Gherghina
9de68440a9
Merge "Match parent width for user spinner to fix tint" into lmp-dev
2014-09-26 17:53:28 +00:00
Alexandra Gherghina
3c3ceb9d42
Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
2014-09-26 17:42:49 +00:00
PauloftheWest
6a66232155
am 0c74ea6c
: am 3aabfca4
: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
...
* commit '0c74ea6cc58054e8bfb74ee1eda4453ac10567ce':
Fixed a crash when rotating a WPS dialog.
2014-09-26 15:04:41 +00:00
PauloftheWest
0c74ea6cc5
am 3aabfca4
: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
...
* commit '3aabfca462af26c487d2a834f70d0998d7556637':
Fixed a crash when rotating a WPS dialog.
2014-09-26 14:54:19 +00:00
PauloftheWest
3aabfca462
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
2014-09-26 14:47:28 +00:00
Michael Wright
65c402ef9a
am 28a049a6
: am 1b87bec5
: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
...
* commit '28a049a69471f1cdb7dce4490ffea38c1b3f417e':
If a device identifier is specified, bring up keyboard layouts dialog.
2014-09-25 22:38:32 +00:00
Michael Wright
28a049a694
am 1b87bec5
: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
...
* commit '1b87bec5de17dc23cf63d9f71358b8c979f8c896':
If a device identifier is specified, bring up keyboard layouts dialog.
2014-09-25 22:26:59 +00:00
Michael Wright
1b87bec5de
Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
2014-09-25 22:18:34 +00:00
PauloftheWest
a7d31e8164
Fixed a crash when rotating a WPS dialog.
...
Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
2014-09-25 12:36:09 -07:00
Zoltan Szatmary-Ban
8c6211b56f
am 15f71b3f
: am a2b7bb6b
: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
...
* commit '15f71b3f952c97b838a6517b75028ce21e3bd06f':
Make Force Stop button work for packages of managed profile
2014-09-25 16:39:17 +00:00
Zoltan Szatmary-Ban
2a26ac58f0
am 6da3f84c
: am 7258650e
: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
...
* commit '6da3f84c9789378d701894a0a65be536da5e220c':
Start PowerUsageDetails fragment in the correct activity
2014-09-25 16:39:16 +00:00