OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 74be17ed: am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in...
vandwalle [Tue, 14 Oct 2014 22:20:08 +0000 (22:20 +0000)]
am 74be17ed: am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '74be17ed2e1a4f078fb186083c15617ca701271d':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405

9 years agoam 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network...
vandwalle [Tue, 14 Oct 2014 22:13:12 +0000 (22:13 +0000)]
am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '7d89e294b5ea6f3501a67e019549bae63cb1eee7':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405

9 years agoam 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self...
vandwalle [Tue, 14 Oct 2014 19:55:58 +0000 (19:55 +0000)]
am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '52e929a9613e52e199dcf12b95acab31be3c25bd':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405

9 years agoam 7ae5528a: am c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update...
Fabrice Di Meglio [Tue, 14 Oct 2014 18:15:58 +0000 (18:15 +0000)]
am 7ae5528a: am c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '7ae5528a53b7a3157684e468a1e09d116401b2c3':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

9 years agoam c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Tue, 14 Oct 2014 18:11:45 +0000 (18:11 +0000)]
am c2f0f751: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit 'c2f0f751dd95bb10d2eeac064d43b016c754aa54':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

9 years agoMerge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on...
Fabrice Di Meglio [Tue, 14 Oct 2014 18:08:17 +0000 (18:08 +0000)]
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

9 years agoam 3ee136eb: am ec3e4cd5: Merge "Settings: Restart existing volumizers in volume...
John Spurlock [Tue, 14 Oct 2014 17:51:08 +0000 (17:51 +0000)]
am 3ee136eb: am ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev

* commit '3ee136eb13134642abc4ad89f0180588ad1d0211':
  Settings: Restart existing volumizers in volume prefs.

9 years agoam f3a306cd: am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update...
Fabrice Di Meglio [Tue, 14 Oct 2014 17:49:27 +0000 (17:49 +0000)]
am f3a306cd: am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit 'f3a306cd94d3cd9e87941dbf3d3b0ecd056d10d5':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

9 years agoam 868326a8: (-s ours) am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa...
Geoff Mendal [Tue, 14 Oct 2014 17:23:00 +0000 (17:23 +0000)]
am 868326a8: (-s ours) am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '868326a8bb542f371106ba8256d0c6631028a037':
  Import translations. DO NOT MERGE

9 years agoam 4083220d: (-s ours) am f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import...
Geoff Mendal [Tue, 14 Oct 2014 17:22:59 +0000 (17:22 +0000)]
am 4083220d: (-s ours) am f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '4083220dba5129345ba1f2a94d0847a1e2f47a01':
  Import translations. DO NOT MERGE

9 years agoam dbd85a70: am a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large...
John Spurlock [Tue, 14 Oct 2014 17:22:58 +0000 (17:22 +0000)]
am dbd85a70: am a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'dbd85a70a2509732a1503ca14230d818f8c8d066':
  Fix battery-history-chart large-mode labels in RTL layouts.

9 years agoam ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into...
John Spurlock [Tue, 14 Oct 2014 16:45:50 +0000 (16:45 +0000)]
am ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev

* commit 'ec3e4cd5f3b8282eff347179a5af7de64371b188':
  Settings: Restart existing volumizers in volume prefs.

9 years agoMerge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
John Spurlock [Tue, 14 Oct 2014 16:40:43 +0000 (16:40 +0000)]
Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev

9 years agoam 2fb9c773: Merge "dont show a config in saved network if it is self added and we...
vandwalle [Tue, 14 Oct 2014 15:38:09 +0000 (15:38 +0000)]
am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

* commit '2fb9c773761b1375c86963ebb8f3bb3bec18e479':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405

9 years agoMerge "dont show a config in saved network if it is self added and we never connected...
vandwalle [Tue, 14 Oct 2014 06:41:26 +0000 (06:41 +0000)]
Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev

9 years agodont show a config in saved network if it is self added and we never connected to it
vandwalle [Tue, 14 Oct 2014 01:44:13 +0000 (18:44 -0700)]
dont show a config in saved network if it is self added and we never connected to it
Bug:17939405

Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e

9 years agoFix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Tue, 14 Oct 2014 00:09:08 +0000 (17:09 -0700)]
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Per UX request, use a Switch for:

Accessibility
- Large text
- High contrast text
- Power button ends call
- Auto-rotate screen
- Speak passwords

Change-Id: I668586f3eb0e458db631e60f272e62f1315d3758

9 years agoam 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Mon, 13 Oct 2014 23:33:06 +0000 (23:33 +0000)]
am 22a57a8c: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '22a57a8cbeea81290f01ac6610729fcdf0b30a1a':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

9 years agoMerge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on...
Fabrice Di Meglio [Mon, 13 Oct 2014 23:29:01 +0000 (23:29 +0000)]
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

9 years agoFix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Mon, 13 Oct 2014 23:02:25 +0000 (16:02 -0700)]
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Per UX request, use a Switch for:

- Automatic date & time
- Automatic time zone
- Use 24-hour format

Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a

9 years agoam 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import...
Geoff Mendal [Mon, 13 Oct 2014 22:41:08 +0000 (22:41 +0000)]
am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6397b5e2f809596b2a77674dd7a701ede24dc3bb':
  Import translations. DO NOT MERGE

9 years agoam f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 13 Oct 2014 22:41:04 +0000 (22:41 +0000)]
am f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels...
John Spurlock [Mon, 13 Oct 2014 22:40:54 +0000 (22:40 +0000)]
am a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'a0d28225352a10c542bb2ee6fd8daef7886c4a25':
  Fix battery-history-chart large-mode labels in RTL layouts.

9 years agoam c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)]
am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

9 years agoam ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 13 Oct 2014 22:21:27 +0000 (22:21 +0000)]
am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 22:20:30 +0000 (22:20 +0000)]
am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

9 years agoam f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 13 Oct 2014 22:17:59 +0000 (22:17 +0000)]
am f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 13 Oct 2014 22:15:43 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 13 Oct 2014 22:15:23 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Mon, 13 Oct 2014 22:14:10 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoam ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Mon, 13 Oct 2014 22:13:01 +0000 (22:13 +0000)]
am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'ef390443eb7a6a4ac52c62aea65e7ba94f1f897a':
  Fix battery-history-chart large-mode labels in RTL layouts.

9 years agoam a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Mon, 13 Oct 2014 22:03:54 +0000 (22:03 +0000)]
am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
  Fix battery-history-chart large-mode labels in RTL layouts.

9 years agoam 6229d683: am ca2d56a8: Merge "Update Settings to use themed Context.getDrawable...
Alan Viverette [Mon, 13 Oct 2014 21:07:50 +0000 (21:07 +0000)]
am 6229d683: am ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev

* commit '6229d683a54a262c77625f031269603969b2fbe5':
  Update Settings to use themed Context.getDrawable()

9 years agoam ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp...
Alan Viverette [Mon, 13 Oct 2014 21:03:17 +0000 (21:03 +0000)]
am ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev

* commit 'ca2d56a84927e08eb5418b79ad5cd6d57db10d23':
  Update Settings to use themed Context.getDrawable()

9 years agoMerge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
Alan Viverette [Mon, 13 Oct 2014 20:58:39 +0000 (20:58 +0000)]
Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev

9 years agoSettings: Restart existing volumizers in volume prefs.
John Spurlock [Wed, 8 Oct 2014 16:34:50 +0000 (12:34 -0400)]
Settings: Restart existing volumizers in volume prefs.

Use the new .start() method to ensure the underlying volumizer
is always started, regardless of pref activity lifecycle.

Depends on frameworks/base:
  I2f860864161f818d5a62a28331ef1c47051fb39f

Bug:17898190
Change-Id: I55dea590c13363730549aa29f194337efccdeaf7

9 years agoam 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)]
am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE

* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
  Import translations. DO NOT MERGE

9 years agoam 77c67943: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 20:32:26 +0000 (20:32 +0000)]
am 77c67943: (-s ours) Import translations. DO NOT MERGE

* commit '77c67943048591b182527757e89b5916a2881d91':
  Import translations. DO NOT MERGE

9 years agoFix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Mon, 13 Oct 2014 19:48:50 +0000 (15:48 -0400)]
Fix battery-history-chart large-mode labels in RTL layouts.

Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 19:44:59 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 19:40:48 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 19:32:00 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monos...
Alan Viverette [Sat, 11 Oct 2014 04:54:56 +0000 (04:54 +0000)]
am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '44da5c19dbe7d438e9601477a17041b4a7700631':
  Add option for serif monospace captioning font

9 years agoam 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to...
Amit Mahajan [Sat, 11 Oct 2014 04:54:55 +0000 (04:54 +0000)]
am 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '63fce990971121eb74fb64a79807223fb3f36cf8':
  Fix to show signal strength as 0 if out of service.

9 years agoam 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioni...
Alan Viverette [Sat, 11 Oct 2014 03:17:23 +0000 (03:17 +0000)]
am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '4ed4249ccd9de8f34a7d59ab48b28494ff942d53':
  Add option for serif monospace captioning font

9 years agoam 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev
Amit Mahajan [Sat, 11 Oct 2014 03:17:20 +0000 (03:17 +0000)]
am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '5c340458fdebc191d70f33913594e9e3429fc5d2':
  Fix to show signal strength as 0 if out of service.

9 years agoam 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font"...
Alan Viverette [Sat, 11 Oct 2014 02:49:47 +0000 (02:49 +0000)]
am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
  Add option for serif monospace captioning font

9 years agoam 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev
Amit Mahajan [Sat, 11 Oct 2014 02:49:38 +0000 (02:49 +0000)]
am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '8151ef29aa80006b7597ed57d507fe48338110c7':
  Fix to show signal strength as 0 if out of service.

9 years agoam 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
Alan Viverette [Sat, 11 Oct 2014 00:23:54 +0000 (00:23 +0000)]
am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
  Add option for serif monospace captioning font

9 years agoresolved conflicts for merge of 88b2790d to lmp-sprout-dev
Amit Mahajan [Sat, 11 Oct 2014 00:15:48 +0000 (17:15 -0700)]
resolved conflicts for merge of 88b2790d to lmp-sprout-dev

Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903

9 years agoMerge "Add option for serif monospace captioning font" into lmp-dev
Alan Viverette [Fri, 10 Oct 2014 23:40:58 +0000 (23:40 +0000)]
Merge "Add option for serif monospace captioning font" into lmp-dev

9 years agoMerge "Fix to show signal strength as 0 if out of service." into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 22:41:08 +0000 (22:41 +0000)]
Merge "Fix to show signal strength as 0 if out of service." into lmp-dev

9 years agoFix to show signal strength as 0 if out of service.
Amit Mahajan [Fri, 10 Oct 2014 21:23:22 +0000 (14:23 -0700)]
Fix to show signal strength as 0 if out of service.

Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a

9 years agoAdd option for serif monospace captioning font
Alan Viverette [Fri, 10 Oct 2014 19:24:45 +0000 (12:24 -0700)]
Add option for serif monospace captioning font

BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da

9 years agoUpdate Settings to use themed Context.getDrawable()
Alan Viverette [Fri, 10 Oct 2014 17:58:58 +0000 (10:58 -0700)]
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

9 years agoam 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L...
Dianne Hackborn [Fri, 10 Oct 2014 17:01:10 +0000 (17:01 +0000)]
am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '9d49e51c854bb25d50c2aefd66aeed6aeb942d2c':
  Update to use "real" L codename.

9 years agoam e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one...
Zoltan Szatmary-Ban [Fri, 10 Oct 2014 16:59:44 +0000 (16:59 +0000)]
am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit 'e807e1ead6f78951b8b84d55f8772d0317f09f14':
  Remove CA Cert UI item from one list only

9 years agoam a883dbba: am 39674811: Merge "Update accessibility service toggle switch when...
Svetoslav [Fri, 10 Oct 2014 16:58:15 +0000 (16:58 +0000)]
am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit 'a883dbba7194b19c14c4fff83f94ee852c7bb798':
  Update accessibility service toggle switch when resuming.

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 c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into...
Dianne Hackborn [Thu, 9 Oct 2014 22:11:49 +0000 (22:11 +0000)]
am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'c30661c05d2455d251f8cedddc3a048e78455f6c':
  Update to use "real" L codename.

9 years agoam 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
Dianne Hackborn [Thu, 9 Oct 2014 22:02:02 +0000 (22:02 +0000)]
am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
  Update to use "real" L codename.

9 years agoam a4204bde: Merge "Update to use "real" L codename." into lmp-dev
Dianne Hackborn [Thu, 9 Oct 2014 19:29:33 +0000 (19:29 +0000)]
am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
  Update to use "real" L codename.

9 years agoam 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:28:05 +0000 (19:28 +0000)]
am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit '90625329608c19c3a0b8f7c98bb8710fe346a220':
  Remove CA Cert UI item from one list only

9 years agoam 95dda800: am 50263efb: Remove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:22:48 +0000 (19:22 +0000)]
am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit '95dda800a988c1ca778dae08563b6875c30d089a':
  Remove CA Cert UI item from one list only

9 years agoam 50263efb: Remove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:11:25 +0000 (19:11 +0000)]
am 50263efb: Remove CA Cert UI item from one list only

* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
  Remove CA Cert UI item from one list only

9 years agoam 39674811: Merge "Update accessibility service toggle switch when resuming." into...
Svetoslav [Thu, 9 Oct 2014 18:26:25 +0000 (18:26 +0000)]
am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit '396748110b8e7e761ee1d82827cc4396ecc5ee66':
  Update accessibility service toggle switch when resuming.

9 years agoMerge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
Svetoslav [Thu, 9 Oct 2014 18:21:53 +0000 (18:21 +0000)]
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

9 years agoMerge "Update to use "real" L codename." into lmp-dev
Dianne Hackborn [Thu, 9 Oct 2014 16:54:16 +0000 (16:54 +0000)]
Merge "Update to use "real" L codename." into lmp-dev

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 agoRemove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 12:00:32 +0000 (13:00 +0100)]
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

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 agoUpdate to use "real" L codename.
Dianne Hackborn [Wed, 8 Oct 2014 16:38:36 +0000 (09:38 -0700)]
Update to use "real" L codename.

Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c

9 years agoUpdate accessibility service toggle switch when resuming.
Svetoslav [Wed, 8 Oct 2014 19:29:12 +0000 (12:29 -0700)]
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

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 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 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 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 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 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