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
PauloftheWest
d005440fa9
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:14 +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
Elliott Hughes
873744fdcb
am d055c6ad: am ebbe9a67: Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
...
* commit 'd055c6ad5db651ff0fdf6431b6bab8230bc873a2':
Use the StorageManager constant for the PatternVisible key.
2014-10-02 23:48:02 +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
d055c6ad5d
am ebbe9a67: Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
...
* commit 'ebbe9a6796eb96776c77c70a0890af3d228e789b':
Use the StorageManager constant for the PatternVisible key.
2014-10-02 23:38:50 +00:00
Wink Saville
3cd6c76e56
am 77ef7163: am 28ec3d9d: am dbd052ed: Enable Sim Settings
...
* commit '77ef716371459665af0e9799b054e587ae56e20e':
Enable Sim Settings
2014-10-02 23:37:57 +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
77ef716371
am 28ec3d9d: am dbd052ed: Enable Sim Settings
...
* commit '28ec3d9db7d1773e53751ecf82a146351fc763dc':
Enable Sim Settings
2014-10-02 23:10:30 +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
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
Baligh Uddin
ac838cde3a
am 2855d2f9: (-s ours) am 51b5e2af: (-s ours) am cb6b336e: (-s ours) am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '2855d2f9e12f9c686e929f37276fa21470b88b57':
Import translations. DO NOT MERGE
2014-10-02 12:47:40 +00:00
Baligh Uddin
d577e39156
am 1e1f52a1: (-s ours) am 8ea8cfab: (-s ours) am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '1e1f52a17db9565b0458393fd79b7f541e19d086':
Import translations. DO NOT MERGE
2014-10-02 12:47:39 +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
Baligh Uddin
06c3fa0690
am e2f219e3: (-s ours) am fffdc1b7: (-s ours) am 8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'e2f219e3b6253e914e77512d24a49a1e2986a206':
Import translations. DO NOT MERGE
2014-10-02 12:47:37 +00:00
Baligh Uddin
6d57737d46
am ac0d5d95: (-s ours) am d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'ac0d5d95a7bf00165f77603f26f3a2439aaaefc0':
Import translations. DO NOT MERGE
2014-10-02 12:47:36 +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
Maurice Lam
92ed83adb6
am ed5ab3e5: am a1ecc44f: am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
...
* commit 'ed5ab3e5d555238489ea8880f5d7211e93f3890f':
[WifiSetup] Update background texture
2014-10-02 12:47:34 +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
Fabrice Di Meglio
0209d691d9
am 37d89ffb: am 3d2441f7: am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev
...
* commit '37d89ffb65b751807216dbae0c1c47ecac17979b':
Update Settings App icons
2014-10-02 12:47:32 +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
Baligh Uddin
44b324c526
am 7e09be13: (-s ours) am 91b315c1: (-s ours) am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '7e09be13705bad913555dedbf7fb16403bc401fb':
Import translations. DO NOT MERGE
2014-10-02 12:47:30 +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
39c3e48639
am 0d903323: am 7d31d81c: am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
...
* commit '0d903323d509613e8c5992f4bf8b0a3ed761ebe5':
Fixed a Setting Bluetooth Airplane mode bug.
2014-10-02 12:40:12 +00:00
Alan Viverette
7d6343e57e
am 63ba6643: am 68e3f05c: am 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
...
* commit '63ba6643fda639b588d4410e4de43659cf062b62':
Ensure recycled APN preferences are updated to show radio button
2014-10-02 12:40:11 +00:00
Baligh Uddin
2855d2f9e1
am 51b5e2af: (-s ours) am cb6b336e: (-s ours) am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '51b5e2af70081ea2d2b70e05341b1cca79e6c5f0':
Import translations. DO NOT MERGE
2014-10-02 12:40:10 +00:00
Baligh Uddin
1e1f52a17d
am 8ea8cfab: (-s ours) am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '8ea8cfabf36f7fb59f4f3fc8c9437a3cde4b539e':
Import translations. DO NOT MERGE
2014-10-02 12:40:09 +00:00
Hui Shu
6abc2c25b5
am e9a39e28: am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
...
* commit 'e9a39e28c21fe6b732e2af13a9c5a658954f749a':
Remove WebView DRP Setting from Developer Settings
2014-10-02 12:40:08 +00:00
Baligh Uddin
e2f219e3b6
am fffdc1b7: (-s ours) am 8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'fffdc1b762df51f1d13717da914ae3380f8581e8':
Import translations. DO NOT MERGE
2014-10-02 12:37:41 +00:00
Baligh Uddin
ac0d5d95a7
am d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'd4936ba987bbd9ea1c6ef441bd9bce8d691e0145':
Import translations. DO NOT MERGE
2014-10-02 12:37:34 +00:00
Zoltan Szatmary-Ban
e40a207b06
am 231c4a23: am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
...
* commit '231c4a231531cadd451c3beeb360de4a72ad6ae2':
Disambiguate categories in Settings > Trusted Credentials
2014-10-02 12:37:20 +00:00
Maurice Lam
ed5ab3e5d5
am a1ecc44f: am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
...
* commit 'a1ecc44fa8802c0a931aec833910d515c88928af':
[WifiSetup] Update background texture
2014-10-02 12:37:19 +00:00
Svetoslav
4b2fc1adad
am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled.
...
* commit '7358b7d56286d1896f833bbd9d970b83dfb5fed1':
Use default encryption password if an accessibility service is enabled.
2014-10-02 12:37:18 +00:00
Fabrice Di Meglio
37d89ffb65
am 3d2441f7: am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev
...
* commit '3d2441f7766fd28c0e08a28eaf0a4f9315533cf0':
Update Settings App icons
2014-10-02 12:37:17 +00:00
PauloftheWest
544ed0ef8e
am cd93da02: am 8506c378: am cc6736bf: am 29aab7a2: Fixed a Settings crash.
...
* commit 'cd93da0235c61061d1eb335783183766c484cab2':
Fixed a Settings crash.
2014-10-02 12:37:16 +00:00
Baligh Uddin
7e09be1370
am 91b315c1: (-s ours) am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '91b315c1d6afac99f51e58488a14d4a1d8498f3a':
Import translations. DO NOT MERGE
2014-10-02 12:37:16 +00:00
PauloftheWest
2f11848cbf
am db464694: am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
...
* commit 'db46469432b67550b9b5968d7aa4004121332b0d':
Fixed multiple MAP issues.
2014-10-02 12:37:16 +00:00
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