Elliott Hughes
e6cd6aef23
am 22ea4c41
: resolved conflicts for merge of 3269c409
to lmp-mr1-dev-plus-aosp
...
* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
Fix percentage formatting throughout Settings.
2014-10-04 16:43:09 +00:00
PauloftheWest
ff14c67143
am 1713fe25
: am 0834ff0b
: am 6ceaa82b
: am 4046cf9c
: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
...
* commit '1713fe2524361a2e10b877925bf93053a6cd173d':
[DS] DSDS support for Settings
2014-10-04 16:05:46 +00:00
Elliott Hughes
50c377f09f
Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
2014-10-04 00:44:10 +00:00
PauloftheWest
6ceaa82b5a
am 4046cf9c
: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
...
* commit '4046cf9cb46762a517b69c6cb78faa5903d6a3d5':
[DS] DSDS support for Settings
2014-10-03 23:57:18 +00:00
Elliott Hughes
83f013cfd4
Fix percentage formatting throughout Settings.
...
Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
2014-10-03 15:52:20 -07:00
PauloftheWest
4046cf9cb4
Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
2014-10-03 22:45:26 +00:00
PauloftheWest
50e6ecacf9
[DS] DSDS support for Settings
...
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.
Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
2014-10-03 15:22:59 -07:00
John Spurlock
68458ae09f
am 66974544
: am a876854d
: am 5ded06ec
: am 40fdd482
: am c05b739c
: Merge "Settings: Update media & alarm stream icons." into lmp-dev
...
* commit '6697454430d1ac52754b4cb1045e151201751214':
Settings: Update media & alarm stream icons.
2014-10-03 14:18:26 +00:00
John Spurlock
5ded06eca1
am 40fdd482
: am c05b739c
: Merge "Settings: Update media & alarm stream icons." into lmp-dev
...
* commit '40fdd482048bbf47878137f8552b6cade6832147':
Settings: Update media & alarm stream icons.
2014-10-03 14:05:42 +00:00
John Spurlock
40fdd48204
am c05b739c
: Merge "Settings: Update media & alarm stream icons." into lmp-dev
...
* commit 'c05b739c691684350b63ca2e232319ee4fcaa76d':
Settings: Update media & alarm stream icons.
2014-10-03 14:00:25 +00:00
John Spurlock
e2356b99a1
Settings: Update media & alarm stream icons.
...
Update icon pointers and remove obsolete preference class.
Bug: 17762712
Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d
2014-10-02 20:06:48 -04:00
Elliott Hughes
8db425c5bb
am 873744fd
: am d055c6ad
: am ebbe9a67
: Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
...
* commit '873744fdcb6d07f58160358a325a4ac0f5ff0ce6':
Use the StorageManager constant for the PatternVisible key.
2014-10-02 23:54:59 +00:00
Wink Saville
67c0b4d98f
am 3cd6c76e
: am 77ef7163
: am 28ec3d9d
: am dbd052ed
: Enable Sim Settings
...
* commit '3cd6c76e5615320691173e18a8386a0868e4e5a1':
Enable Sim Settings
2014-10-02 23:46:20 +00:00
Elliott Hughes
ebbe9a6796
Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
2014-10-02 23:35:07 +00:00
Wink Saville
dbd052ed5e
Enable Sim Settings
...
Changes from Paul and MTK will be coming soon but this
allow us to do some initial testing.
Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257
2014-10-02 15:54:21 -07:00
Elliott Hughes
f9d6d29163
Use the StorageManager constant for the PatternVisible key.
...
Bug: 17659622
Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5
2014-10-02 13:29:58 -07:00
PauloftheWest
5a06a42c3e
am 39c3e486
: am 0d903323
: am 7d31d81c
: am c744c448
: am 59d33dbd
: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
...
* commit '39c3e48639e0e937445a8482cc5144a4e7ad7211':
Fixed a Setting Bluetooth Airplane mode bug.
2014-10-02 12:47:42 +00:00
Alan Viverette
1fd275f0e9
am 7d6343e5
: am 63ba6643
: am 68e3f05c
: am 91f4e5a8
: am 7a4d229d
: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
...
* commit '7d6343e57e8e2a0cca9092ab760e278921b096c6':
Ensure recycled APN preferences are updated to show radio button
2014-10-02 12:47:41 +00:00
Hui Shu
19a1a8c3f9
am 6abc2c25
: am e9a39e28
: am 9184ed5c
: am c1c9888d
: am 905f9e2f
: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
...
* commit '6abc2c25b568d352de948519e76cbd3a38b77efb':
Remove WebView DRP Setting from Developer Settings
2014-10-02 12:47:38 +00:00
Zoltan Szatmary-Ban
9c4e4cae03
am e40a207b
: am 231c4a23
: am b5550a65
: am 45f8ffa1
: am b0c216d3
: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
...
* commit 'e40a207b06814509f3fb7daafc61b2bea151d0ee':
Disambiguate categories in Settings > Trusted Credentials
2014-10-02 12:47:35 +00:00
Svetoslav
fa9699c13d
am 4b2fc1ad
: am 7358b7d5
: am e78840ff
: am 42eff3b7
: am 52448442
: Use default encryption password if an accessibility service is enabled.
...
* commit '4b2fc1adad9e27b9a78732a87678297834f82e9c':
Use default encryption password if an accessibility service is enabled.
2014-10-02 12:47:33 +00:00
PauloftheWest
955ead53bd
am 544ed0ef
: am cd93da02
: am 8506c378
: am cc6736bf
: am 29aab7a2
: Fixed a Settings crash.
...
* commit '544ed0ef8e72191f76cda597475d4ae3da963cb9':
Fixed a Settings crash.
2014-10-02 12:47:31 +00:00
PauloftheWest
9d31ad24f1
am 2f11848c
: am db464694
: am c4ef9bf8
: am dc5f87ff
: am 709ddd5c
: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit '2f11848cbf02ff8c1a75303ee4c0e2b63b002e43':
Fixed multiple MAP issues.
2014-10-02 12:47:29 +00:00
PauloftheWest
c744c448e4
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 21:12:30 +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
91f4e5a8af
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 20:12:01 +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
Hui Shu
c1c9888db4
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 18:32:04 +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
45f8ffa1da
am b0c216d3
: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
...
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
Disambiguate categories in Settings > Trusted Credentials
2014-10-01 17:02:07 +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
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
PauloftheWest
cc6736bfde
am 29aab7a2
: Fixed a Settings crash.
...
* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
Fixed a Settings crash.
2014-10-01 14:58:41 +00: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
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
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
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
Robert Greenwalt
0f3eb7b287
am a3c7a104
: am 42dd9335
: am 20371b52
: am 613620df
: am ce77a43a
: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
...
* commit 'a3c7a104b353bc67a4de6bc9ec391de0c1c9372f':
ATT Entitlement changes in Settings to pass Tether Type.
2014-09-29 19:44:57 +00:00
Elliott Hughes
8d8aa7b5a2
am 00d038df
: am 100bed71
: am 38c42ec1
: am 66392541
: am ed6a6ca0
: Make the system locale available to the decryption UI.
...
* commit '00d038df28adebf3d9d70d0afc101b17c15ee3d0':
Make the system locale available to the decryption UI.
2014-09-29 19:44:47 +00:00
Alexandra Gherghina
023a5cfa22
am f458406f
: am 294c32ce
: am 5dab2fd3
: am c7611429
: am 3c3ceb9d
: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
...
* commit 'f458406f4046092bb71d164f57bf2b4b8b6e1564':
Use plain user icon in UserSpinnerAdapter
2014-09-29 19:44:13 +00:00
PauloftheWest
6e07d41a7e
am 3708cce5
: am e03d52be
: am 6a662321
: am 0c74ea6c
: am 3aabfca4
: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
...
* commit '3708cce50598bf5855178c1b7ed8dca58fd95452':
Fixed a crash when rotating a WPS dialog.
2014-09-29 19:44:12 +00:00
PauloftheWest
709ddd5c24
Merge "Fixed multiple MAP issues." into lmp-dev
2014-09-29 15:10:23 +00:00
Sky Faber
ec4ba9b538
User wifi separation feature.
...
-Enable forget button for all users.
Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
2014-09-27 02:05:47 +00:00
Vinit Deshpande
d7d604056b
Merge "Separate wifi AP added by applications."
2014-09-27 02:01:13 +00:00
Sky Faber
2d657e3629
Separate wifi AP added by applications.
...
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.
Change-Id: I12943563ef714c4287e13488578f020d136d006d
2014-09-27 02:00:36 +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