Dianne Hackborn
449eac9f66
am eac414ae: am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'eac414ae23a2b0db870ca5ed82b2900aa18e38cc':
Update to use "real" L codename.
2014-10-10 18:41:57 +00:00
Zoltan Szatmary-Ban
e9cc344746
am ac8a4c07: am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only
...
* commit 'ac8a4c0762df40b5525eadad4f979ae38ab78229':
Remove CA Cert UI item from one list only
2014-10-10 18:41:56 +00:00
Svetoslav
1337305a8e
am aaeaa9da: am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
...
* commit 'aaeaa9dadc004929b2fb4ee5e21c2099ec36cbbd':
Update accessibility service toggle switch when resuming.
2014-10-10 18:41:55 +00:00
Alan Viverette
0ba89bd54c
Update Settings to use themed Context.getDrawable()
...
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.
BUG: 17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
2014-10-10 10:58:58 -07:00
Sanket Padawe
ea2e53ead5
am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
...
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
Removing display number format from SIM UI
2014-10-10 05:15:52 +00:00
Dianne Hackborn
c30661c05d
am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
...
* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.
2014-10-09 22:02:02 +00:00
Dianne Hackborn
8541206e6b
am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
2014-10-09 19:29:33 +00:00
Zoltan Szatmary-Ban
9062532960
am 95dda800: am 50263efb: Remove CA Cert UI item from one list only
...
* commit '95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only
2014-10-09 19:22:48 +00:00
Zoltan Szatmary-Ban
95dda800a9
am 50263efb: Remove CA Cert UI item from one list only
...
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
2014-10-09 19:11:25 +00:00
Svetoslav
396748110b
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
2014-10-09 18:21:53 +00:00
Dianne Hackborn
a4204bde45
Merge "Update to use "real" L codename." into lmp-dev
2014-10-09 16:54:16 +00:00
Sanket Padawe
04b8b4c1a4
am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
2014-10-09 13:03:33 +00:00
Zoltan Szatmary-Ban
50263efbaf
Remove CA Cert UI item from one list only
...
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.
Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
2014-10-09 13:00:32 +01:00
Sanket Padawe
e4cbb86596
Merge "Removing display number format from SIM UI" into lmp-sprout-dev
2014-10-09 00:33:10 +00:00
Sanket Padawe
770bdd771e
Removing display number format from SIM UI
...
Removed "Display Number" from the SIM settings UI.
Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
2014-10-08 16:05:36 -07:00
Dianne Hackborn
308c8fdfec
Update to use "real" L codename.
...
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
2014-10-08 15:48:25 -07:00
Svetoslav
17fd600fc6
Update accessibility service toggle switch when resuming.
...
An accessibility service can be enabled via a global gesture
in which case if the settings activity for enabling the service
is running its toggle switch is shown in the wrong state.
bug:16558106
Change-Id: I2821b148475a7afae21e29148ef98db724c817f2
2014-10-08 19:47:55 +00:00
Amith Yamasani
b7a635f66d
am 711785f5: am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '711785f59cfe9aeb71e686bd7f45781bd545472c':
Set default restrictions for a newly created user
2014-10-07 20:41:15 +00:00
Amith Yamasani
6b911d59eb
am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
Set default restrictions for a newly created user
2014-10-07 20:03:26 +00:00
Amith Yamasani
c55c581a8a
am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
...
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user
2014-10-07 19:58:24 +00:00
Amith Yamasani
a766bfa3de
Set default restrictions for a newly created user
...
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.
Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
2014-10-07 17:13:16 +00:00
Mike Lockwood
3f6ef34b35
Add developer setting for changing the current USB configuration
...
This can be useful for testing the audio source kernel driver,
reverse tethering over RNDIS, etc.
Change-Id: I7392f95545cf5ae8a36b4b7b0d37f003df7e70b2
2014-10-06 10:17:13 -07:00
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