PauloftheWest
324f29c86d
am 59d33dbd
: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
...
* commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 22:38:25 +00:00
Alan Viverette
dc174c8593
am 7a4d229d
: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
...
* commit '7a4d229d2dd958fe033c739785eae6728caa5184':
Ensure recycled APN preferences are updated to show radio button
2014-10-01 22:38:05 +00:00
Baligh Uddin
ee3d7127cf
am 9d4dc326
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
2014-10-01 22:37:43 +00:00
Hui Shu
bbb8928a4f
am 905f9e2f
: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
...
* commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
Remove WebView DRP Setting from Developer Settings
2014-10-01 22:37:18 +00:00
Zoltan Szatmary-Ban
9cb9286dc2
am b0c216d3
: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
...
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
2014-10-01 22:36:15 +00:00
Maurice Lam
001d854068
am f7b56708
: Merge "[WifiSetup] Update background texture" into lmp-dev
...
* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
[WifiSetup] Update background texture
2014-10-01 22:34:39 +00:00
PauloftheWest
59d33dbd25
Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
2014-10-01 21:07:56 +00:00
Alan Viverette
7a4d229d2d
Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
2014-10-01 20:05:21 +00:00
Alan Viverette
3cf5d1ea71
Ensure recycled APN preferences are updated to show radio button
...
BUG: 17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
2014-10-01 12:43:10 -07:00
Baligh Uddin
9d4dc326d1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-01 19:29:10 +00:00
Hui Shu
905f9e2f90
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
2014-10-01 18:28:52 +00:00
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
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
6b5b77d2ac
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-09-30 23:38:17 +00: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
Fabrice Di Meglio
ca99afb57a
am fc14e272
: Merge "Update Settings App icons" into lmp-dev
...
* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
Update Settings App icons
2014-09-30 19:50:30 +00: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
PauloftheWest
c0d0a208e4
am 29aab7a2
: Fixed a Settings crash.
...
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
2014-09-30 15:54:51 +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
08a08b344b
am 5c664d8e
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
Import translations. DO NOT MERGE
2014-09-29 20:40:37 +00:00
PauloftheWest
6dfb48bf48
am 709ddd5c
: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
Fixed multiple MAP issues.
2014-09-29 20:40:36 +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
4670af5327
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:40 +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
c9482dd9d6
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:57 +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
e4b18b7994
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 21:57:19 +00:00
Alexandra Gherghina
8e4be6afb4
am 3c3ceb9d
: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
...
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
Use plain user icon in UserSpinnerAdapter
2014-09-26 21:57:18 +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
2af51dbcfe
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:31 +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
2e0d4080ee
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 23:44:01 +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
2d9cbcea03
am a2b7bb6b
: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
...
* commit 'a2b7bb6be612fc050fc7634815a614f84fcac778':
Make Force Stop button work for packages of managed profile
2014-09-25 10:46:33 +00:00
Zoltan Szatmary-Ban
8812d97393
am 7258650e
: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
...
* commit '7258650efdea447dea6f2f557cb9d2b90df92754':
Start PowerUsageDetails fragment in the correct activity
2014-09-25 10:46:32 +00:00
Zoltan Szatmary-Ban
a2b7bb6be6
Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
2014-09-25 10:38:40 +00:00
Zoltan Szatmary-Ban
7258650efd
Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
2014-09-25 10:35:58 +00:00
Alexandra Gherghina
e4124f4743
Match parent width for user spinner to fix tint
...
Bug: 17640172
Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
2014-09-25 11:29:17 +01:00
Alexandra Gherghina
7d3b6b4703
Use plain user icon in UserSpinnerAdapter
...
Before, we were using CircleFramedDrawable, used by user settings.
That performs some alterations on the image (adds an outline and
shadow) that made it inconsistent with the corp icon.
Bug: 17561925
Change-Id: I2490360d332a1b93864858122868b571f2949617
2014-09-25 11:07:42 +01:00