OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
Sanket Padawe [Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)]
am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

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

9 years agoresolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp
Sanket Padawe [Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)]
resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80

9 years agoam 04b8b4c1: am e4cbb865: Merge "Removing display number format from SIM UI" into...
Sanket Padawe [Thu, 9 Oct 2014 13:16:15 +0000 (13:16 +0000)]
am 04b8b4c1: am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev

* commit '04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
  Removing display number format from SIM UI

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 711785f5: am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default...
Amith Yamasani [Tue, 7 Oct 2014 20:41:15 +0000 (20:41 +0000)]
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

9 years agoam 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions...
Amith Yamasani [Tue, 7 Oct 2014 20:34:51 +0000 (20:34 +0000)]
am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '436796e4ccf327c09e104a5bda27788a029c85e7':
  Set default restrictions for a newly created user

9 years agoam 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly...
Amith Yamasani [Tue, 7 Oct 2014 20:08:32 +0000 (20:08 +0000)]
am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '6b911d59eb2da863c53e5e338dec22974a79b654':
  Set default restrictions for a newly created user

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 agoMerge "Add developer setting for changing the current USB configuration"
Mike Lockwood [Tue, 7 Oct 2014 17:12:20 +0000 (17:12 +0000)]
Merge "Add developer setting for changing the current USB configuration"

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Tue, 7 Oct 2014 12:22:01 +0000 (12:22 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoam 4813fcdd: (-s ours) am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a...
Geoff Mendal [Tue, 7 Oct 2014 01:03:43 +0000 (01:03 +0000)]
am 4813fcdd: (-s ours) am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '4813fcdd98041a39d0a55ac4a5feadd27ea72194':
  Import translations. DO NOT MERGE

9 years agoam ea11d700: (-s ours) am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95...
Geoff Mendal [Tue, 7 Oct 2014 01:03:42 +0000 (01:03 +0000)]
am ea11d700: (-s ours) am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

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

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

9 years agoam 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translati...
Geoff Mendal [Tue, 7 Oct 2014 00:56:04 +0000 (00:56 +0000)]
am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

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

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

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

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

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 6380422d: (-s ours) am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translati...
Geoff Mendal [Tue, 7 Oct 2014 00:25:37 +0000 (00:25 +0000)]
am 6380422d: (-s ours) am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE

* commit '6380422d2553cbfb3901654cb68b0134fb4a8794':
  Import translations. DO NOT MERGE

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

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

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

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

9 years agoam 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Tue, 7 Oct 2014 00:18:58 +0000 (00:18 +0000)]
am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE

* commit '3a797b8bdb3f4d68e7483478030f704688169ea6':
  Import translations. DO NOT MERGE

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

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

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

* commit '78fb95728d534a7099c220ea21fc13f3b52afd5f':
  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 [Tue, 7 Oct 2014 00:00:54 +0000 (17:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c277439d0c0ffb1f36e56fdad5669c7fbc44c56
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 agoAdd developer setting for changing the current USB configuration
Mike Lockwood [Mon, 22 Sep 2014 19:15:24 +0000 (12:15 -0700)]
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

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

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

9 years agoam 56ee8dda: (-s ours) am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235...
Baligh Uddin [Sun, 5 Oct 2014 18:30:05 +0000 (18:30 +0000)]
am 56ee8dda: (-s ours) am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE

* commit '56ee8dda0d04f64a30ebdc65ce572752facd70e4':
  Import translations. DO NOT MERGE

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

* commit '04b3b84d30d723e71ea501b929f7b4af81e1150d':
  Import translations. DO NOT MERGE

9 years agoam 2856ab17: (-s ours) am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translati...
Baligh Uddin [Sun, 5 Oct 2014 18:23:50 +0000 (18:23 +0000)]
am 2856ab17: (-s ours) am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

* commit '2856ab17ef578ccb42f0ee7324a95121fb28ea7d':
  Import translations. DO NOT MERGE

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

* commit '44705ba3c254b62c8ab95ef5d05a5c1e3c8c0a75':
  Import translations. DO NOT MERGE

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

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

9 years agoam a0f460e4: (-s ours) am 44a32145: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:19:28 +0000 (18:19 +0000)]
am a0f460e4: (-s ours) am 44a32145: (-s ours) Import translations. DO NOT MERGE

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

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 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:16:35 +0000 (18:16 +0000)]
am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

* commit '08edaf4a15d4b7e3f90902ed952b9ce3cf5b863f':
  Import translations. DO NOT MERGE

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

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

9 years agoam 44a32145: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:12:01 +0000 (18:12 +0000)]
am 44a32145: (-s ours) Import translations. DO NOT MERGE

* commit '44a32145ca9400540c2fe82cad265bceb60d5f05':
  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 f6a4f3e1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 5 Oct 2014 18:10:03 +0000 (18:10 +0000)]
am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

* commit 'f6a4f3e1eaa98a2c39732d0900996664e0256622':
  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 agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Sun, 5 Oct 2014 18:06:24 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE"

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

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

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:36:10 +0000 (21:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: If0f8717088e311300497cdced1071430511640e5
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 agoam 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp
Elliott Hughes [Sat, 4 Oct 2014 16:43:09 +0000 (16:43 +0000)]
am 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
  Fix percentage formatting throughout Settings.

9 years agoresolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp
Elliott Hughes [Sat, 4 Oct 2014 16:38:07 +0000 (09:38 -0700)]
resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d

9 years agoam 1713fe25: am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for...
PauloftheWest [Sat, 4 Oct 2014 16:05:46 +0000 (16:05 +0000)]
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

9 years agoam 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into...
PauloftheWest [Sat, 4 Oct 2014 15:45:10 +0000 (15:45 +0000)]
am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '0834ff0b870d022f028a45a81ca5887eb99f4677':
  [DS] DSDS support for Settings

9 years agoam 50c377f0: Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev
Elliott Hughes [Sat, 4 Oct 2014 00:48:06 +0000 (00:48 +0000)]
am 50c377f0: Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev

* commit '50c377f09ffba10d7ff4787b7641aee4975c6f98':
  Fix percentage formatting throughout Settings.

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 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev
PauloftheWest [Sat, 4 Oct 2014 00:04:28 +0000 (00:04 +0000)]
am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '6ceaa82b5a188e2f000d2224f7fb8d6d4b9cf139':
  [DS] DSDS support for Settings

9 years agoam 4ab0396c: am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility...
Svetoslav [Sat, 4 Oct 2014 00:01:27 +0000 (00:01 +0000)]
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.

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 agoam 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure...
Svetoslav [Fri, 3 Oct 2014 22:39:26 +0000 (22:39 +0000)]
am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit '94c1f70c8833a5b7b3858213b7d8a30b647c1bb2':
  Update accessibility plus secure lock warning messages.

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 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning...
Svetoslav [Fri, 3 Oct 2014 22:20:41 +0000 (22:20 +0000)]
am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

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

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 66974544: am a876854d: am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings...
John Spurlock [Fri, 3 Oct 2014 14:18:26 +0000 (14:18 +0000)]
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.

9 years agoam a876854d: am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media...
John Spurlock [Fri, 3 Oct 2014 14:14:35 +0000 (14:14 +0000)]
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.

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

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

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 ebe0125f: am d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspo...
PauloftheWest [Fri, 3 Oct 2014 14:04:49 +0000 (14:04 +0000)]
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.

9 years agoam d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog...
PauloftheWest [Fri, 3 Oct 2014 14:00:26 +0000 (14:00 +0000)]
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.

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 agoam de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material...
PauloftheWest [Fri, 3 Oct 2014 13:56:10 +0000 (13:56 +0000)]
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.

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 agoam 873744fd: am d055c6ad: am ebbe9a67: Merge "Use the StorageManager constant for...
Elliott Hughes [Thu, 2 Oct 2014 23:54:59 +0000 (23:54 +0000)]
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.

9 years agoam d055c6ad: am ebbe9a67: Merge "Use the StorageManager constant for the PatternVisib...
Elliott Hughes [Thu, 2 Oct 2014 23:48:02 +0000 (23:48 +0000)]
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.

9 years agoam 3cd6c76e: am 77ef7163: am 28ec3d9d: am dbd052ed: Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 23:46:20 +0000 (23:46 +0000)]
am 3cd6c76e: am 77ef7163: am 28ec3d9d: am dbd052ed: Enable Sim Settings

* commit '3cd6c76e5615320691173e18a8386a0868e4e5a1':
  Enable Sim Settings

9 years agoam ebbe9a67: Merge "Use the StorageManager constant for the PatternVisible key."...
Elliott Hughes [Thu, 2 Oct 2014 23:38:50 +0000 (23:38 +0000)]
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.

9 years agoam 77ef7163: am 28ec3d9d: am dbd052ed: Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 23:37:57 +0000 (23:37 +0000)]
am 77ef7163: am 28ec3d9d: am dbd052ed: Enable Sim Settings

* commit '77ef716371459665af0e9799b054e587ae56e20e':
  Enable Sim Settings

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 28ec3d9d: am dbd052ed: Enable Sim Settings
Wink Saville [Thu, 2 Oct 2014 23:10:30 +0000 (23:10 +0000)]
am 28ec3d9d: am dbd052ed: Enable Sim Settings

* commit '28ec3d9db7d1773e53751ecf82a146351fc763dc':
  Enable Sim Settings

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 39c3e486: am 0d903323: am 7d31d81c: am c744c448: am 59d33dbd: Merge "Fixed a Setti...
PauloftheWest [Thu, 2 Oct 2014 12:47:42 +0000 (12:47 +0000)]
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.

9 years agoam 7d6343e5: am 63ba6643: am 68e3f05c: am 91f4e5a8: am 7a4d229d: Merge "Ensure recycl...
Alan Viverette [Thu, 2 Oct 2014 12:47:41 +0000 (12:47 +0000)]
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

9 years agoam 2855d2f9: (-s ours) am 51b5e2af: (-s ours) am cb6b336e: (-s ours) am 299c6e12...
Baligh Uddin [Thu, 2 Oct 2014 12:47:40 +0000 (12:47 +0000)]
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

9 years agoam 1e1f52a1: (-s ours) am 8ea8cfab: (-s ours) am 48f0021c: (-s ours) am 0905bb07...
Baligh Uddin [Thu, 2 Oct 2014 12:47:39 +0000 (12:47 +0000)]
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

9 years agoam 6abc2c25: am e9a39e28: am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebVie...
Hui Shu [Thu, 2 Oct 2014 12:47:38 +0000 (12:47 +0000)]
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