OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:35:43 +0000 (02:35 +0000)]
am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial

* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
  Fix bad string in EncryptionInterstitial

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

* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial

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 agoam 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is...
Jim Miller [Sat, 18 Oct 2014 01:45:40 +0000 (01:45 +0000)]
am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled

* commit '138d7b6273bdf2f9eb6eb2a55eeae3d6d5c93cf6':
  Show warning dialog when Accessibility is enabled

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

* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
  Show warning dialog when Accessibility is enabled

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 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionIntersti...
Jim Miller [Sat, 18 Oct 2014 00:03:07 +0000 (00:03 +0000)]
am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '3221a342117bc3fd366e3f6520db0cb0672bb1f1':
  Several fixes to new EncryptionInterstitial dialog.

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

* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
  Several fixes to new EncryptionInterstitial dialog.

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 agoam 1f39d6a6: am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides stron...
Svetoslav [Fri, 17 Oct 2014 23:19:09 +0000 (23:19 +0000)]
am 1f39d6a6: am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

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

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

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

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 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Fri, 17 Oct 2014 21:36:55 +0000 (21:36 +0000)]
am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '140b46e43ca70e2ef13d8a3840cde20b16adba45':
  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 [Fri, 17 Oct 2014 21:32:34 +0000 (21:32 +0000)]
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

9 years agoam 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
Amith Yamasani [Fri, 17 Oct 2014 21:13:23 +0000 (21:13 +0000)]
am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.

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

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

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

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

Per UX request, convert Trusted Credentials CheckBoxes to Switches

Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca

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 agoam 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage...
Fabrice Di Meglio [Fri, 17 Oct 2014 21:00:51 +0000 (21:00 +0000)]
am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev

* commit '5c467bc615e1a7553d05c361cd7fd7ac8cc4c0cb':
  Fix bug #18024258 Crash in Settings observed after tap on Usage statistics

9 years agoam 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Fri, 17 Oct 2014 20:53:16 +0000 (20:53 +0000)]
am 27c0b548: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

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

9 years agoMerge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics...
Fabrice Di Meglio [Fri, 17 Oct 2014 20:52:56 +0000 (20:52 +0000)]
Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev

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

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 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 20:02:22 +0000 (20:02 +0000)]
am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.

* commit '0303bb203059e75c729804405d481bd3333c4098':
  Add strings for upcoming change.

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

* commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a':
  Add strings for upcoming change.

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 b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibilit...
Svetoslav [Fri, 17 Oct 2014 19:07:37 +0000 (19:07 +0000)]
am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

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

9 years agoam 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service...
Svetoslav [Fri, 17 Oct 2014 18:53:32 +0000 (18:53 +0000)]
am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
  User to confirm credentials if an accessibility service changes encryption.

9 years agoFix bug #18024258 Crash in Settings observed after tap on Usage statistics
Fabrice Di Meglio [Fri, 17 Oct 2014 18:29:06 +0000 (11:29 -0700)]
Fix bug #18024258 Crash in Settings observed after tap on Usage statistics

- update to correct class name (was changed in a former CL and introduced
this regression)

Change-Id: Ia945a5be2d8c7d19c1daf400a9d2d2a6589de137

9 years agoam 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into...
Alan Viverette [Fri, 17 Oct 2014 18:07:21 +0000 (18:07 +0000)]
am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev

* commit '2106c79bc28324aa2bb3658b19c58551ddc1cc14':
  Prevent NPE when no accessibility services are enabled

9 years agoMerge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
Alan Viverette [Fri, 17 Oct 2014 18:03:34 +0000 (18:03 +0000)]
Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev

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 agoam 27334dbe: Settings: Fix hotspot switch state issue.
John Spurlock [Fri, 17 Oct 2014 16:36:18 +0000 (16:36 +0000)]
am 27334dbe: Settings: Fix hotspot switch state issue.

* commit '27334dbe75c131103606e455eb75c55804fe93de':
  Settings: Fix hotspot switch state issue.

9 years agoSettings: Fix hotspot switch state issue.
John Spurlock [Fri, 17 Oct 2014 15:54:16 +0000 (11:54 -0400)]
Settings: Fix hotspot switch state issue.

Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de

9 years agoPrevent NPE when no accessibility services are enabled
Alan Viverette [Fri, 17 Oct 2014 01:27:18 +0000 (18:27 -0700)]
Prevent NPE when no accessibility services are enabled

BUG: 18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2

9 years agoam 63af7fc7: Remove excess whitespace from the factory reset screen
Sami Tolvanen [Fri, 17 Oct 2014 00:48:17 +0000 (00:48 +0000)]
am 63af7fc7: Remove excess whitespace from the factory reset screen

* commit '63af7fc70e1242398dbebce5443072f0bc33e864':
  Remove excess whitespace from the factory reset screen

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 agoFix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Fri, 17 Oct 2014 00:16:26 +0000 (17:16 -0700)]
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Per UX request, convert Account Sync feeds CheckBoxes to Switches

Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b

9 years agoMerge "Fix bug #18017952 It does not search all possible "USB" results that can be...
Fabrice Di Meglio [Thu, 16 Oct 2014 22:33:25 +0000 (22:33 +0000)]
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
automerge: 4a43a10

* commit '4a43a107d7b70444d21aaf98fac7381e3adac7b5':
  Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

9 years agoRemove excess whitespace from the factory reset screen
Sami Tolvanen [Thu, 16 Oct 2014 22:19:17 +0000 (15:19 -0700)]
Remove excess whitespace from the factory reset screen

The bullet pointed list in the factory reset screen consists
of two separate strings, which lead to excess whitespace
between the two segments of the list. Remove padding from the
text views to remove the whitespace.

Bug: 17997459
Change-Id: I60eb6f0f2924323d7eb806ff2b1180ebc7189adb

9 years agoMerge "Fix bug #18017952 It does not search all possible "USB" results that can be...
Fabrice Di Meglio [Thu, 16 Oct 2014 22:08:17 +0000 (22:08 +0000)]
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev

9 years agoam 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Thu, 16 Oct 2014 21:45:10 +0000 (21:45 +0000)]
am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

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

9 years agoFix bug #18017952 It does not search all possible "USB" results that can be found...
Fabrice Di Meglio [Thu, 16 Oct 2014 21:42:10 +0000 (14:42 -0700)]
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

- add indexing for UsbSettings
- change constant name from RANK_MEMORY to RANK_STORAGE
- fix old issue with the PreferenceScreen title (as Location instead of USB computer connection)

Change-Id: I1395ec3d6a795edf73a8703545540456a477cc21

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

9 years agoam d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 16 Oct 2014 17:56:40 +0000 (17:56 +0000)]
am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import...
Geoff Mendal [Thu, 16 Oct 2014 17:56:39 +0000 (17:56 +0000)]
am a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

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

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

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

* commit '0172dfef41dbd728b603d470bc4650290a2276b4':
  Import translations. DO NOT MERGE

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

Per UX request, convert more CheckBoxes to Switches

Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7

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 agoam 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 00:52:31 +0000 (00:52 +0000)]
am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '628d83e736f2f9e606327f3debe2930bb24a83e9':
  Import translations. DO NOT MERGE

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 agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 16 Oct 2014 00:47:49 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

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 agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 00:43:59 +0000 (17:43 -0700)]
Import translations. DO NOT MERGE

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

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

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

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 agoam 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
Jim Miller [Wed, 15 Oct 2014 21:13:41 +0000 (21:13 +0000)]
am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

* commit '1d050220a0564b02bc1f4c33c5984a684a47bfa5':
  Add a checkbox option to 'require password to decrypt'

9 years agoam 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev
Jim Miller [Wed, 15 Oct 2014 21:02:09 +0000 (21:02 +0000)]
am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
  Add a checkbox option to 'require password to decrypt'

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 5e916480: am 6b68b000: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in...
Fabrice Di Meglio [Wed, 15 Oct 2014 01:18:37 +0000 (01:18 +0000)]
am 5e916480: am 6b68b000: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev

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

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

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

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 agoam 40103896: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum...
Fabrice Di Meglio [Wed, 15 Oct 2014 00:01:37 +0000 (00:01 +0000)]
am 40103896: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '40103896b08fbd4b8d191fc2805ec8f482d22d17':
  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 23:54:09 +0000 (23:54 +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 [Tue, 14 Oct 2014 23:43:37 +0000 (16:43 -0700)]
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

Per UX request, use a Switch instead of a CheckBox for Developer Settings

Change-Id: I6a9b3fef879299a8ac5b57ff9c794b58022b79d9

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 f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say...
Jason Monk [Tue, 14 Oct 2014 23:12:23 +0000 (23:12 +0000)]
am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev

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

9 years agoam d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource...
Andres Morales [Tue, 14 Oct 2014 23:11:21 +0000 (23:11 +0000)]
am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit 'd3948a2eda0b4adc2541ae19fe87c067459a69d9':
  Set layout_width in WiFi+NFC resource

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

* commit '9e6c6b9fb550390f9488c923827bbf5599dec3c2':
  Update screen pinning strings to say Overview

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 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 22:26:15 +0000 (22:26 +0000)]
am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3':
  Set layout_width in WiFi+NFC resource

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