OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
Sanket Padawe [Thu, 9 Oct 2014 13:03:33 +0000 (13:03 +0000)]
am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev

* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
  Removing display number format from SIM UI

9 years agoMerge "Removing display number format from SIM UI" into lmp-sprout-dev
Sanket Padawe [Thu, 9 Oct 2014 00:33:10 +0000 (00:33 +0000)]
Merge "Removing display number format from SIM UI" into lmp-sprout-dev

9 years agoRemoving display number format from SIM UI
Sanket Padawe [Wed, 8 Oct 2014 22:41:41 +0000 (15:41 -0700)]
Removing display number format from SIM UI

Removed "Display Number" from the SIM settings UI.

Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469

9 years agoam c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user...
Amith Yamasani [Tue, 7 Oct 2014 20:03:26 +0000 (20:03 +0000)]
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

9 years agoam 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
Amith Yamasani [Tue, 7 Oct 2014 19:58:24 +0000 (19:58 +0000)]
am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
  Set default restrictions for a newly created user

9 years agoMerge "Set default restrictions for a newly created user" into lmp-dev
Amith Yamasani [Tue, 7 Oct 2014 17:41:09 +0000 (17:41 +0000)]
Merge "Set default restrictions for a newly created user" into lmp-dev

9 years agoSet default restrictions for a newly created user
Amith Yamasani [Mon, 6 Oct 2014 21:16:11 +0000 (14:16 -0700)]
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

9 years agoam 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]
am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f':
  Import translations. DO NOT MERGE

9 years agoam c3cd6d95: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]
am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

* commit 'c3cd6d956b2687a99564010b888513250d2ac29d':
  Import translations. DO NOT MERGE

9 years agoam 7096c2dd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:08:25 +0000 (00:08 +0000)]
am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:04:43 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I86bdfc2ed82420c69d8123d82c3e376eef9ff2b1
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 23:57:23 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: I24a02b89f2baf4a914ff56381e46f8a326b9ddba
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Oct 2014 23:53:34 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE

Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import

9 years agoam b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:17:26 +0000 (18:17 +0000)]
am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit 'b305e7adecfafbcfd0c41354750dd2a77c3fdfa9':
  Import translations. DO NOT MERGE

9 years agoam 43848de1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:10:55 +0000 (18:10 +0000)]
am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit '43848de1603dc30e390049e2057285303132a836':
  Import translations. DO NOT MERGE

9 years agoam 4aed4235: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:09:22 +0000 (18:09 +0000)]
am 4aed4235: (-s ours) Import translations. DO NOT MERGE

* commit '4aed423562538583076fe3568bdd01a613d5b36f':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 04:38:39 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9049c251a4ee54d87835a2a4a892c15ddf313a1e
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 04:33:29 +0000 (21:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4aa14267640180bada6274d733dfe955835a8b9
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 04:30:28 +0000 (21:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iebb3a9a429b160434faeae21a112480e888c6bb4
Auto-generated-cl: translation import

9 years agoMerge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
Elliott Hughes [Sat, 4 Oct 2014 00:44:10 +0000 (00:44 +0000)]
Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev

9 years agoam 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
PauloftheWest [Fri, 3 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '4046cf9cb46762a517b69c6cb78faa5903d6a3d5':
  [DS] DSDS support for Settings

9 years agoFix percentage formatting throughout Settings.
Elliott Hughes [Thu, 2 Oct 2014 23:36:32 +0000 (16:36 -0700)]
Fix percentage formatting throughout Settings.

Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d

9 years agoMerge "[DS] DSDS support for Settings" into lmp-sprout-dev
PauloftheWest [Fri, 3 Oct 2014 22:45:26 +0000 (22:45 +0000)]
Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

9 years ago[DS] DSDS support for Settings
PauloftheWest [Fri, 3 Oct 2014 18:07:14 +0000 (11:07 -0700)]
[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

9 years agoam 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 22:12:34 +0000 (22:12 +0000)]
am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit '35314f2771a9443acf334bf90ac88f582ded43ee':
  Update accessibility plus secure lock warning messages.

9 years agoam 5cdd3f4f: Update accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 22:06:18 +0000 (22:06 +0000)]
am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit '5cdd3f4f6fcee6af89742dc0427df4bba4214cc8':
  Update accessibility plus secure lock warning messages.

9 years agoUpdate accessibility plus secure lock warning messages.
Svetoslav [Fri, 3 Oct 2014 20:27:08 +0000 (13:27 -0700)]
Update accessibility plus secure lock warning messages.

bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d

9 years agoam 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into...
John Spurlock [Fri, 3 Oct 2014 14:05:42 +0000 (14:05 +0000)]
am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit '40fdd482048bbf47878137f8552b6cade6832147':
  Settings: Update media & alarm stream icons.

9 years agoam c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
John Spurlock [Fri, 3 Oct 2014 14:00:25 +0000 (14:00 +0000)]
am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit 'c05b739c691684350b63ca2e232319ee4fcaa76d':
  Settings: Update media & alarm stream icons.

9 years agoMerge "Settings: Update media & alarm stream icons." into lmp-dev
John Spurlock [Fri, 3 Oct 2014 13:55:34 +0000 (13:55 +0000)]
Merge "Settings: Update media & alarm stream icons." into lmp-dev

9 years agoam 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
PauloftheWest [Fri, 3 Oct 2014 13:50:51 +0000 (13:50 +0000)]
am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.

* commit '32ce9484b7e8b039bb7d5b9f31ddaa9834fc1f5d':
  Updated Wi-Fi hotspot dialog to the Material Spec.

9 years agoam 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
PauloftheWest [Fri, 3 Oct 2014 13:46:28 +0000 (13:46 +0000)]
am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.

* commit '6e26427e521a79a11c1a9e1b64995494290eaf7c':
  Updated Wi-Fi hotspot dialog to the Material Spec.

9 years agoSettings: Update media & alarm stream icons.
John Spurlock [Thu, 2 Oct 2014 23:20:36 +0000 (19:20 -0400)]
Settings: Update media & alarm stream icons.

Update icon pointers and remove obsolete preference class.

Bug: 17762712
Change-Id: Ia4b96c5b38f2a73a7a339b2ab3abfcd433f4403d

9 years agoMerge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev
Elliott Hughes [Thu, 2 Oct 2014 23:35:07 +0000 (23:35 +0000)]
Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev

9 years agoam dbd052ed: Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am dbd052ed: Enable Sim Settings

* commit 'dbd052ed5ee71b2fc552e0a2954f8c283acc6f70':
  Enable Sim Settings

9 years agoEnable Sim Settings
Wink Saville [Thu, 2 Oct 2014 22:54:21 +0000 (15:54 -0700)]
Enable Sim Settings

Changes from Paul and MTK will be coming soon but this
allow us to do some initial testing.

Change-Id: Ic52bc3656bc7066c8bbb7435eaf14e9b8e66a257

9 years agoUpdated Wi-Fi hotspot dialog to the Material Spec.
PauloftheWest [Thu, 2 Oct 2014 13:22:47 +0000 (06:22 -0700)]
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

9 years agoUse the StorageManager constant for the PatternVisible key.
Elliott Hughes [Thu, 2 Oct 2014 20:29:58 +0000 (13:29 -0700)]
Use the StorageManager constant for the PatternVisible key.

Bug: 17659622
Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5

9 years agoam c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into...
PauloftheWest [Wed, 1 Oct 2014 22:18:00 +0000 (22:18 +0000)]
am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

* commit 'c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a':
  Fixed a Setting Bluetooth Airplane mode bug.

9 years agoam 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show...
Alan Viverette [Wed, 1 Oct 2014 22:17:46 +0000 (22:17 +0000)]
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

9 years agoam 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 1 Oct 2014 22:16:50 +0000 (22:16 +0000)]
am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '299c6e127d5105890a963208a64309af42051b56':
  Import translations. DO NOT MERGE

9 years agoam 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 1 Oct 2014 22:16:47 +0000 (22:16 +0000)]
am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '0905bb07fc7059afc567d03dbca7696604aee0e2':
  Import translations. DO NOT MERGE

9 years agoam c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings...
Hui Shu [Wed, 1 Oct 2014 22:15:49 +0000 (22:15 +0000)]
am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit 'c1c9888db4171a9db81345f428342ec838b5da99':
  Remove WebView DRP Setting from Developer Settings

9 years agoam 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
PauloftheWest [Wed, 1 Oct 2014 21:12:30 +0000 (21:12 +0000)]
am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

* commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
  Fixed a Setting Bluetooth Airplane mode bug.

9 years agoMerge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
PauloftheWest [Wed, 1 Oct 2014 21:07:55 +0000 (21:07 +0000)]
Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

9 years agoam 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button...
Alan Viverette [Wed, 1 Oct 2014 20:12:01 +0000 (20:12 +0000)]
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

9 years agoMerge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 20:05:20 +0000 (20:05 +0000)]
Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev

9 years agoEnsure recycled APN preferences are updated to show radio button
Alan Viverette [Wed, 1 Oct 2014 19:42:18 +0000 (12:42 -0700)]
Ensure recycled APN preferences are updated to show radio button

BUG: 17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342

9 years agoam 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 1 Oct 2014 19:32:32 +0000 (19:32 +0000)]
am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:16 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:12 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Wed, 1 Oct 2014 19:29:10 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoam 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Hui Shu [Wed, 1 Oct 2014 18:32:04 +0000 (18:32 +0000)]
am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

* commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
  Remove WebView DRP Setting from Developer Settings

9 years agoMerge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
Hui Shu [Wed, 1 Oct 2014 18:28:51 +0000 (18:28 +0000)]
Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev

9 years agoam 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Creden...
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:20:47 +0000 (17:20 +0000)]
am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
  Disambiguate categories in Settings > Trusted Credentials

9 years agoam b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into...
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 17:02:07 +0000 (17:02 +0000)]
am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials

9 years agoMerge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
Zoltan Szatmary-Ban [Wed, 1 Oct 2014 15:47:59 +0000 (15:47 +0000)]
Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev

9 years agoFixed a Setting Bluetooth Airplane mode bug.
PauloftheWest [Wed, 1 Oct 2014 13:14:58 +0000 (06:14 -0700)]
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

9 years agoam 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
Maurice Lam [Wed, 1 Oct 2014 15:09:26 +0000 (15:09 +0000)]
am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev

* commit '5fdb8fa41d44fe31148f00b6c909f511f11fde52':
  [WifiSetup] Update background texture

9 years agoam 42eff3b7: am 52448442: Use default encryption password if an accessibility service...
Svetoslav [Wed, 1 Oct 2014 15:09:25 +0000 (15:09 +0000)]
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.

9 years agoam 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev
Fabrice Di Meglio [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev

* commit '976aba99c8b06676b9e097de74287bb70138c848':
  Update Settings App icons

9 years agoam cc6736bf: am 29aab7a2: Fixed a Settings crash.
PauloftheWest [Wed, 1 Oct 2014 15:09:24 +0000 (15:09 +0000)]
am cc6736bf: am 29aab7a2: Fixed a Settings crash.

* commit 'cc6736bfdee735c236814488a169ee5a7c461f73':
  Fixed a Settings crash.

9 years agoam f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
Maurice Lam [Wed, 1 Oct 2014 15:03:19 +0000 (15:03 +0000)]
am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev

* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
  [WifiSetup] Update background texture

9 years agoam 52448442: Use default encryption password if an accessibility service is enabled.
Svetoslav [Wed, 1 Oct 2014 15:02:20 +0000 (15:02 +0000)]
am 52448442: Use default encryption password if an accessibility service is enabled.

* commit '524484426855f814ff1f3189fd5221dd630dbf8c':
  Use default encryption password if an accessibility service is enabled.

9 years agoam fc14e272: Merge "Update Settings App icons" into lmp-dev
Fabrice Di Meglio [Wed, 1 Oct 2014 15:00:30 +0000 (15:00 +0000)]
am fc14e272: Merge "Update Settings App icons" into lmp-dev

* commit 'fc14e272aaed6a6e36c044b93e12d68896aaa543':
  Update Settings App icons

9 years agoam 29aab7a2: Fixed a Settings crash.
PauloftheWest [Wed, 1 Oct 2014 14:58:41 +0000 (14:58 +0000)]
am 29aab7a2: Fixed a Settings crash.

* commit '29aab7a2ad3cabdc1681fdc93a0f00b20072d385':
  Fixed a Settings crash.

9 years agoMerge "[WifiSetup] Update background texture" into lmp-dev
Maurice Lam [Wed, 1 Oct 2014 01:54:40 +0000 (01:54 +0000)]
Merge "[WifiSetup] Update background texture" into lmp-dev

9 years ago[WifiSetup] Update background texture
Maurice Lam [Tue, 30 Sep 2014 02:40:42 +0000 (19:40 -0700)]
[WifiSetup] Update background texture

Bug: 17611097
Change-Id: I75264ecac3b689426500e063a18d687866638a85

9 years agoRemove WebView DRP Setting from Developer Settings
Hui Shu [Tue, 30 Sep 2014 23:53:36 +0000 (16:53 -0700)]
Remove WebView DRP Setting from Developer Settings

BUG: 17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0

9 years agoUse default encryption password if an accessibility service is enabled.
Svetoslav [Tue, 30 Sep 2014 01:15:45 +0000 (18:15 -0700)]
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

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Sep 2014 19:59:02 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I79c53aaccbdec874aa56c457c61e8f5858a42c45
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Sep 2014 19:51:14 +0000 (12:51 -0700)]
Import translations. DO NOT MERGE

Change-Id: I484b3919be4abf29231049a2e96867b0a8453538
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Sep 2014 19:47:02 +0000 (12:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3b6fcec9576d2305d0eb872b9d3d404f4b0556a1
Auto-generated-cl: translation import

9 years agoMerge "Update Settings App icons" into lmp-dev
Fabrice Di Meglio [Tue, 30 Sep 2014 19:45:31 +0000 (19:45 +0000)]
Merge "Update Settings App icons" into lmp-dev

9 years agoDisambiguate categories in Settings > Trusted Credentials
Zoltan Szatmary-Ban [Tue, 30 Sep 2014 15:30:07 +0000 (16:30 +0100)]
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

9 years agoUpdate Settings App icons
Fabrice Di Meglio [Tue, 30 Sep 2014 02:17:56 +0000 (19:17 -0700)]
Update Settings App icons

Per UX request

See bug: #17703962 update Settings app icons

Change-Id: I3cc0010e498a6150d6633ae9f0def408db22c77a

9 years agoFixed a Settings crash.
PauloftheWest [Fri, 26 Sep 2014 23:05:44 +0000 (16:05 -0700)]
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

9 years agoam 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 29 Sep 2014 20:50:31 +0000 (20:50 +0000)]
am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6cbdf17e7b8244601174295d2ddeb333c073cfc4':
  Import translations. DO NOT MERGE

9 years agoam dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
PauloftheWest [Mon, 29 Sep 2014 20:50:30 +0000 (20:50 +0000)]
am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev

* commit 'dc5f87fffceac79169fe546055f2ecc3a4142bfe':
  Fixed multiple MAP issues.

9 years agoam 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '5c664d8e20e2b093f7602f8114e26a4c97f45ebd':
  Import translations. DO NOT MERGE

9 years agoam 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
PauloftheWest [Mon, 29 Sep 2014 20:41:53 +0000 (20:41 +0000)]
am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev

* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
  Fixed multiple MAP issues.

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 29 Sep 2014 16:37:22 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoMerge "Fixed multiple MAP issues." into lmp-dev
PauloftheWest [Mon, 29 Sep 2014 15:10:23 +0000 (15:10 +0000)]
Merge "Fixed multiple MAP issues." into lmp-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Sep 2014 07:31:03 +0000 (00:31 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic77eba24209b5d24e9272fb70f3c828e5f04d422
Auto-generated-cl: translation import

9 years agoam 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether...
Robert Greenwalt [Sat, 27 Sep 2014 00:18:16 +0000 (00:18 +0000)]
am 613620df: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev

* commit '613620df13f01c9871a71c83e4df8cc58031478e':
  ATT Entitlement changes in Settings to pass Tether Type.

9 years agoam ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into...
Robert Greenwalt [Sat, 27 Sep 2014 00:13:17 +0000 (00:13 +0000)]
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.

9 years agoMerge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
Robert Greenwalt [Sat, 27 Sep 2014 00:09:02 +0000 (00:09 +0000)]
Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev

9 years agoam 66392541: am ed6a6ca0: Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 23:03:52 +0000 (23:03 +0000)]
am 66392541: am ed6a6ca0: Make the system locale available to the decryption UI.

* commit '66392541346505eaa4825323bb4ba28f55f1d136':
  Make the system locale available to the decryption UI.

9 years agoam ed6a6ca0: Make the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 22:58:34 +0000 (22:58 +0000)]
am ed6a6ca0: Make the system locale available to the decryption UI.

* commit 'ed6a6ca0266346142cfd07389ae9c5b3be6b1eb6':
  Make the system locale available to the decryption UI.

9 years agoMake the system locale available to the decryption UI.
Elliott Hughes [Fri, 26 Sep 2014 19:29:12 +0000 (12:29 -0700)]
Make the system locale available to the decryption UI.

Bug: 17659622
Change-Id: I8f7d1c4d1d04ec483b6a3c9bea742f79374b647a

9 years agoATT Entitlement changes in Settings to pass Tether Type.
Rohit Sisodia [Mon, 22 Sep 2014 21:34:56 +0000 (16:34 -0500)]
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

9 years agoam 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint...
Alexandra Gherghina [Fri, 26 Sep 2014 20:11:30 +0000 (20:11 +0000)]
am 8ea6cbf7: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev

* commit '8ea6cbf7d9a6f92bb76564c281597341b0ad1ebb':
  Match parent width for user spinner to fix tint

9 years agoam c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into...
Alexandra Gherghina [Fri, 26 Sep 2014 20:11:29 +0000 (20:11 +0000)]
am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
  Use plain user icon in UserSpinnerAdapter

9 years agoam 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:28 +0000 (19:55 +0000)]
am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev

* commit '9de68440a9ae9cfadee3939c1ca461e42871f766':
  Match parent width for user spinner to fix tint

9 years agoam 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 19:55:27 +0000 (19:55 +0000)]
am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit '3c3ceb9d42ddd8ee65547183b3685fd088a6676e':
  Use plain user icon in UserSpinnerAdapter

9 years agoMerge "Match parent width for user spinner to fix tint" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 17:53:27 +0000 (17:53 +0000)]
Merge "Match parent width for user spinner to fix tint" into lmp-dev

9 years agoMerge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
Alexandra Gherghina [Fri, 26 Sep 2014 17:42:48 +0000 (17:42 +0000)]
Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

9 years agoam 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into...
PauloftheWest [Fri, 26 Sep 2014 15:04:41 +0000 (15:04 +0000)]
am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev

* commit '0c74ea6cc58054e8bfb74ee1eda4453ac10567ce':
  Fixed a crash when rotating a WPS dialog.

9 years agoam 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
PauloftheWest [Fri, 26 Sep 2014 14:54:19 +0000 (14:54 +0000)]
am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev

* commit '3aabfca462af26c487d2a834f70d0998d7556637':
  Fixed a crash when rotating a WPS dialog.

9 years agoMerge "Fixed a crash when rotating a WPS dialog." into lmp-dev
PauloftheWest [Fri, 26 Sep 2014 14:47:27 +0000 (14:47 +0000)]
Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev