OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 6 Nov 2014 17:49:04 +0000 (09:49 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 3 Nov 2014 18:07:02 +0000 (10:07 -0800)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Oct 2014 20:38:11 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 16:49:35 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoSkip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 22:04:21 +0000 (22:04 +0000)]
Skip Misc/Overcounted battery stats in release builds.
automerge: f7a5017

* commit 'f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
  Skip Misc/Overcounted battery stats in release builds.

9 years agoSkip Misc/Overcounted battery stats in release builds.
Michael Wright [Fri, 24 Oct 2014 21:25:49 +0000 (14:25 -0700)]
Skip Misc/Overcounted battery stats in release builds.

Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac

9 years agoMerge "WIP support icon" into lmp-sprout-dev
Sanket Padawe [Fri, 24 Oct 2014 17:34:23 +0000 (17:34 +0000)]
Merge "WIP support icon" into lmp-sprout-dev

9 years agoWIP support icon
Sanket Padawe [Fri, 24 Oct 2014 17:17:08 +0000 (10:17 -0700)]
WIP support icon

Added static sim icon to alert box for selecting different sim accounts.

Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d

9 years agoam 8d7fdc61: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Oct 2014 21:52:59 +0000 (21:52 +0000)]
am 8d7fdc61: (-s ours) Import translations. DO NOT MERGE

* commit '8d7fdc618a914d6c35f1033dafac5ab3cf0c930e':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 23 Oct 2014 21:37:38 +0000 (14:37 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
Amith Yamasani [Thu, 23 Oct 2014 00:02:44 +0000 (00:02 +0000)]
am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev

* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
  Disable factory reset for secondary users

9 years agoMerge "Disable factory reset for secondary users" into lmp-dev
Amith Yamasani [Wed, 22 Oct 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Disable factory reset for secondary users" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Wed, 22 Oct 2014 23:57:24 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:29:28 +0000 (16:29 -0700)]
Import translations. DO NOT MERGE

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

9 years agoDisable factory reset for secondary users
Amith Yamasani [Wed, 22 Oct 2014 20:51:53 +0000 (13:51 -0700)]
Disable factory reset for secondary users

Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.

Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9

9 years agoSIM settings display name changes
Sanket Padawe [Wed, 22 Oct 2014 18:36:08 +0000 (11:36 -0700)]
SIM settings display name changes

Resubmitting the change for displaying SIM name in SIM settings.

Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8

9 years agoam d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into...
Paul Jensen [Wed, 22 Oct 2014 17:26:58 +0000 (17:26 +0000)]
am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev

* commit 'd9b8d1803aac44f382e330ea62bc936e049a1aed':
  Launch browser directly when user selects "Mobile Plan".

9 years agoMerge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
Paul Jensen [Wed, 22 Oct 2014 17:17:00 +0000 (17:17 +0000)]
Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev

9 years agoMerge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
Sanket Padawe [Tue, 21 Oct 2014 21:56:06 +0000 (21:56 +0000)]
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev

9 years agoCommit with dialog box but using subinfo records
Sanket Padawe [Tue, 21 Oct 2014 21:16:12 +0000 (14:16 -0700)]
Commit with dialog box but using subinfo records

Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:57:55 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

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

9 years agoam 795c8378: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:41:26 +0000 (23:41 +0000)]
am 795c8378: (-s ours) Import translations. DO NOT MERGE

* commit '795c83780752d0301985d53e2e230c2088af825b':
  Import translations. DO NOT MERGE

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

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

9 years agoMerge "Changing settings UI changes related to strings to be displayed" into lmp...
Sanket Padawe [Mon, 20 Oct 2014 20:42:57 +0000 (20:42 +0000)]
Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev

9 years agoChanging settings UI changes related to strings to be displayed
Sanket Padawe [Wed, 15 Oct 2014 18:25:34 +0000 (11:25 -0700)]
Changing settings UI changes related to strings to be displayed

Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd

9 years agoam 25149b38: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:23 +0000 (19:57 +0000)]
am 25149b38: (-s ours) Import translations. DO NOT MERGE

* commit '25149b389501afc817f1248d704def0b4c5b5c04':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:10:53 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE

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

9 years agoLaunch browser directly when user selects "Mobile Plan".
Paul Jensen [Sat, 18 Oct 2014 02:09:37 +0000 (22:09 -0400)]
Launch browser directly when user selects "Mobile Plan".

Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser.  The ConnectivityService
code has since been removed, so just launch the browser directly.

bug:17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9

9 years agoam aa037675: Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:09:26 +0000 (02:09 +0000)]
am aa037675: Fix bad string in EncryptionInterstitial

* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial

9 years agoFix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 01:28:52 +0000 (18:28 -0700)]
Fix bad string in EncryptionInterstitial

The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.

Fixes bug 17881324

Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96

9 years agoam 47adff0a: Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 01:20:53 +0000 (01:20 +0000)]
am 47adff0a: Show warning dialog when Accessibility is enabled

* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
  Show warning dialog when Accessibility is enabled

9 years agoShow warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 00:43:18 +0000 (17:43 -0700)]
Show warning dialog when Accessibility is enabled

This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".

Fixes bug 17881324

Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71

9 years agoam 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:52:42 +0000 (23:52 +0000)]
am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.

9 years agoMerge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

9 years agoSeveral fixes to new EncryptionInterstitial dialog.
Jim Miller [Fri, 17 Oct 2014 02:49:07 +0000 (19:49 -0700)]
Several fixes to new EncryptionInterstitial dialog.

The code now observes whether accessibility is turned on when
deciding the default state.

Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.

Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.

Fixes bug 17881324

Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0

9 years agoam ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings...
Svetoslav [Fri, 17 Oct 2014 23:08:40 +0000 (23:08 +0000)]
am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
  Accessibility no longer overrides strong encryption (Settings).

9 years agoMerge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

9 years agoAccessibility no longer overrides strong encryption (Settings).
Svetoslav [Fri, 17 Oct 2014 21:37:02 +0000 (14:37 -0700)]
Accessibility no longer overrides strong encryption (Settings).

Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4

9 years agoam e52c159c: Fix some strings for the encryption stuff.
Amith Yamasani [Fri, 17 Oct 2014 21:02:34 +0000 (21:02 +0000)]
am e52c159c: Fix some strings for the encryption stuff.

* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.

9 years agoFix some strings for the encryption stuff.
Amith Yamasani [Fri, 17 Oct 2014 20:42:14 +0000 (13:42 -0700)]
Fix some strings for the encryption stuff.

Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c

9 years agoam 4f903c3e: Add strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 19:52:03 +0000 (19:52 +0000)]
am 4f903c3e: Add strings for upcoming change.

* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
  Add strings for upcoming change.

9 years agoAdd strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 19:04:21 +0000 (12:04 -0700)]
Add strings for upcoming change.

Fixes bug 17881324

Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327

9 years agoam 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
Svetoslav [Fri, 17 Oct 2014 16:56:40 +0000 (16:56 +0000)]
am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
  User to confirm credentials if an accessibility service changes encryption.

9 years agoUser to confirm credentials if an accessibility service changes encryption.
Svetoslav [Thu, 16 Oct 2014 21:44:25 +0000 (14:44 -0700)]
User to confirm credentials if an accessibility service changes encryption.

When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.

bug:17881324

Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Thu, 16 Oct 2014 00:55:46 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 00:47:51 +0000 (17:47 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 00:45:42 +0000 (00:45 +0000)]
am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 00:38:03 +0000 (00:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 00:31:39 +0000 (17:31 -0700)]
Import translations. DO NOT MERGE

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

9 years agoresolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
Jim Miller [Wed, 15 Oct 2014 20:54:37 +0000 (13:54 -0700)]
resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62

9 years agoAdd a checkbox option to 'require password to decrypt'
Jim Miller [Tue, 14 Oct 2014 01:15:17 +0000 (18:15 -0700)]
Add a checkbox option to 'require password to decrypt'

Fixes bug 17881324

Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0

9 years agoam 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSetting...
Fabrice Di Meglio [Wed, 15 Oct 2014 00:44:23 +0000 (00:44 +0000)]
am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

* commit '94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
  Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity

9 years agoMerge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0...
Fabrice Di Meglio [Wed, 15 Oct 2014 00:39:57 +0000 (00:39 +0000)]
Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

9 years agoFix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attac...
Fabrice Di Meglio [Tue, 14 Oct 2014 01:59:34 +0000 (18:59 -0700)]
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity

- prevent IllegalStateException

Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee

9 years agoam eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
Jason Monk [Tue, 14 Oct 2014 22:47:23 +0000 (22:47 +0000)]
am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev

* commit 'eaf84472ea10e0ec34b22faad0438700a86787b9':
  Update screen pinning strings to say Overview

9 years agoMerge "Update screen pinning strings to say Overview" into lmp-dev
Jason Monk [Tue, 14 Oct 2014 22:42:49 +0000 (22:42 +0000)]
Merge "Update screen pinning strings to say Overview" into lmp-dev

9 years agoam 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 22:20:34 +0000 (22:20 +0000)]
am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '26bc6907b93a21adcdf8ffdc24d7d96482be8165':
  Set layout_width in WiFi+NFC resource

9 years agoMerge "Set layout_width in WiFi+NFC resource" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 22:03:34 +0000 (22:03 +0000)]
Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

9 years agoSet layout_width in WiFi+NFC resource
Andres Morales [Tue, 14 Oct 2014 20:49:31 +0000 (13:49 -0700)]
Set layout_width in WiFi+NFC resource

Bug:17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208

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 agoUpdate screen pinning strings to say Overview
Jason Monk [Tue, 14 Oct 2014 13:29:25 +0000 (09:29 -0400)]
Update screen pinning strings to say Overview

Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495

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 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 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-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 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 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:32:00 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE

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

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 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 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 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 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 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 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:53:34 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE

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

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

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

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