Commit Graph

7370 Commits

Author SHA1 Message Date
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
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
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
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
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
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
PauloftheWest
709ddd5c24 Merge "Fixed multiple MAP issues." into lmp-dev 2014-09-29 15:10:23 +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
Elliott Hughes
6639254134 am ed6a6ca0: Make the system locale available to the decryption UI.
* commit 'ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
  Make the system locale available to the decryption UI.
2014-09-26 22:58:34 +00:00
Elliott Hughes
ed6a6ca026 Make the system locale available to the decryption UI.
Bug: 17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a
2014-09-26 15:17:35 -07:00
Rohit Sisodia
37155e9633 ATT Entitlement changes in Settings to pass Tether Type.
ATT has different provisioning servers for BT,Wifi and USB Tethering and
Entitlement app need the type of Tethering to be passed before provisioning
request goes out.

Bug:17640036

Change-Id: I6683a747e1925716575ba683aeefc644ced7e37f
2014-09-26 15:09:03 -07:00
Alexandra Gherghina
c7611429e9 am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter
2014-09-26 19:55:27 +00:00
Alexandra Gherghina
3c3ceb9d42 Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev 2014-09-26 17:42:49 +00:00
PauloftheWest
0c74ea6cc5 am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '3aabfca462af26c487d2a834f70d0998d7556637':
  Fixed a crash when rotating a WPS dialog.
2014-09-26 14:54:19 +00:00