PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,667 Commits 1 Branch 0 Tags
cd9bf25db658ac3f70f8a4b99f8e270e9f6fa631
Commit Graph

17667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
22ea4c41ae resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp 
Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d
 2014-10-04 09:38:07 -07: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
PauloftheWest
1713fe2524 am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 
* commit '0834ff0b870d022f028a45a81ca5887eb99f4677':
  [DS] DSDS support for Settings
 2014-10-04 15:45:10 +00:00
Elliott Hughes
3269c409eb am 50c377f0: Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev 
* commit '50c377f09ffba10d7ff4787b7641aee4975c6f98':
  Fix percentage formatting throughout Settings.
 2014-10-04 00:48:06 +00:00
Elliott Hughes
50c377f09f Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev 2014-10-04 00:44:10 +00:00
PauloftheWest
0834ff0b87 am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 
* commit '6ceaa82b5a188e2f000d2224f7fb8d6d4b9cf139':
  [DS] DSDS support for Settings
 2014-10-04 00:04:28 +00:00
Svetoslav
7b2a6a47c7 am 4ab0396c: am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '4ab0396c7fbb25033f7c81dc297bafb96778eb3a':
  Update accessibility plus secure lock warning messages.
 2014-10-04 00:01:27 +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
Svetoslav
4ab0396c7f am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '94c1f70c8833a5b7b3858213b7d8a30b647c1bb2':
  Update accessibility plus secure lock warning messages.
 2014-10-03 22:39: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
Svetoslav
94c1f70c88 am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '5c690775bca9aa5bf3b5cb5b6fb49542e006f223':
  Update accessibility plus secure lock warning messages.
 2014-10-03 22:20:41 +00:00
Svetoslav
5c690775bc am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '35314f2771a9443acf334bf90ac88f582ded43ee':
  Update accessibility plus secure lock warning messages.
 2014-10-03 22:12:34 +00:00
Svetoslav
35314f2771 am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
  Update accessibility plus secure lock warning messages.
 2014-10-03 22:06:18 +00:00
Svetoslav
5cdd3f4f6f Update accessibility plus secure lock warning messages. 
bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
 2014-10-03 13:27:13 -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
6697454430 am a876854d: am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev 
* commit 'a876854d8e119fe464122b082882a6ec34fe4529':
  Settings: Update media & alarm stream icons.
 2014-10-03 14:14:35 +00:00
John Spurlock
a876854d8e am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev 
* commit '5ded06eca13a91da5ab40890ebfaedeae8c000f2':
  Settings: Update media & alarm stream icons.
 2014-10-03 14:10:28 +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
PauloftheWest
3db132a58f am ebe0125f: am d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'ebe0125fa87588b96df510c7c6ba91ad011d8fc2':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 14:04:49 +00:00
PauloftheWest
ebe0125fa8 am d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'd960f94f2d270123e562a303df7c169cceb7ee0c':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 14:00:26 +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
PauloftheWest
d960f94f2d am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'de8ef74e1ab1cd026969a881838762ecf49945fa':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 13:56:10 +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
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