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
c05b739c69
Merge "Settings: Update media & alarm stream icons." into lmp-dev
2014-10-03 13:55:35 +00:00
PauloftheWest
de8ef74e1a
am 32ce9484
: am 6e26427e
: Updated Wi-Fi hotspot dialog to the Material Spec.
...
* commit '32ce9484b7e8b039bb7d5b9f31ddaa9834fc1f5d':
Updated Wi-Fi hotspot dialog to the Material Spec.
2014-10-03 13:50:51 +00:00
PauloftheWest
32ce9484b7
am 6e26427e
: Updated Wi-Fi hotspot dialog to the Material Spec.
...
* commit '6e26427e521a79a11c1a9e1b64995494290eaf7c':
Updated Wi-Fi hotspot dialog to the Material Spec.
2014-10-03 13:46:28 +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
ebbe9a6796
Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
2014-10-02 23:35:07 +00:00
Wink Saville
28ec3d9db7
am dbd052ed
: Enable Sim Settings
...
* commit 'dbd052ed5ee71b2fc552e0a2954f8c283acc6f70':
Enable Sim Settings
2014-10-02 23:04:12 +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
PauloftheWest
6e26427e52
Updated Wi-Fi hotspot dialog to the Material Spec.
...
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.
Bug: 17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
2014-10-02 14:25:03 -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
7d31d81c85
am c744c448
: am 59d33dbd
: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
...
* commit 'c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a':
Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 22:18:00 +00:00
Alan Viverette
68e3f05cab
am 91f4e5a8
: am 7a4d229d
: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
...
* commit '91f4e5a8aff6266bcb9fb717f8bfc8a4323fc9cf':
Ensure recycled APN preferences are updated to show radio button
2014-10-01 22:17:46 +00:00
Baligh Uddin
cb6b336ec2
am 299c6e12
: (-s ours) am 9d4dc326
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '299c6e127d5105890a963208a64309af42051b56':
Import translations. DO NOT MERGE
2014-10-01 22:16:50 +00:00
Baligh Uddin
48f0021cec
am 0905bb07
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '0905bb07fc7059afc567d03dbca7696604aee0e2':
Import translations. DO NOT MERGE
2014-10-01 22:16:47 +00:00
Hui Shu
9184ed5cb4
am c1c9888d
: am 905f9e2f
: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
...
* commit 'c1c9888db4171a9db81345f428342ec838b5da99':
Remove WebView DRP Setting from Developer Settings
2014-10-01 22:15:49 +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
Baligh Uddin
299c6e127d
am 9d4dc326
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
Import translations. DO NOT MERGE
2014-10-01 19:32:32 +00:00
Baligh Uddin
0905bb07fc
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-01 19:29:16 +00:00
Baligh Uddin
8133d31b52
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-10-01 19:29:12 +00:00
Baligh Uddin
9d4dc326d1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-01 19:29:10 +00: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
b5550a65c0
am 45f8ffa1
: am b0c216d3
: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
...
* commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
Disambiguate categories in Settings > Trusted Credentials
2014-10-01 17:20:47 +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
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