OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is...
Jim Miller [Sat, 18 Oct 2014 03:32:04 +0000 (03:32 +0000)]
am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled automerge: 06810c4
automerge: 34927f8

* commit '34927f8a1e58e3b77ef7d6f7af52f62ab8aadc5d':
  Show warning dialog when Accessibility is enabled

9 years agoam 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is...
Jim Miller [Sat, 18 Oct 2014 03:06:19 +0000 (03:06 +0000)]
am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
automerge: 06810c4

* commit '06810c482834a27975da050db32f3d2c27fbe793':
  Show warning dialog when Accessibility is enabled

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

* commit '4d14cb67ad17a16c7ce9845feb361e51d1096015':
  Several fixes to new EncryptionInterstitial dialog.

9 years agoam 05656a36: am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new Encry...
Jim Miller [Sat, 18 Oct 2014 00:07:36 +0000 (00:07 +0000)]
am 05656a36: am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '05656a369d2fc22bd5abff16a49556a57a5abc3f':
  Several fixes to new EncryptionInterstitial dialog.

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

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

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

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

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

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

9 years agoam 6e7216ab: am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update...
Fabrice Di Meglio [Fri, 17 Oct 2014 21:42:00 +0000 (21:42 +0000)]
am 6e7216ab: am 140b46e4: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

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

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 d8bdc10c: am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings...
Amith Yamasani [Fri, 17 Oct 2014 21:28:52 +0000 (21:28 +0000)]
am d8bdc10c: am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.

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

9 years agoam 693046d5: am b3c1c095: am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings...
Fabrice Di Meglio [Fri, 17 Oct 2014 21:28:51 +0000 (21:28 +0000)]
am 693046d5: am b3c1c095: am 5c467bc6: Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev

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

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

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

9 years agoam 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for...
Jim Miller [Fri, 17 Oct 2014 21:28:42 +0000 (21:28 +0000)]
am 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.

* commit '40fbd26a40a85a7f820ef58d4cc3c3d648e23ae6':
  Add strings for upcoming change.

9 years agoam 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm...
Svetoslav [Fri, 17 Oct 2014 21:28:41 +0000 (21:28 +0000)]
am 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.

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

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

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

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

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

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

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

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

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

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

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

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 03b976ac: am 2106c79b: Merge "Prevent NPE when no accessibility services are enabl...
Alan Viverette [Fri, 17 Oct 2014 18:16:54 +0000 (18:16 +0000)]
am 03b976ac: am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev automerge: 026c1ac

* commit '03b976ac7bfc1eafb6c5fc11ebd19fabb90d8368':
  Prevent NPE when no accessibility services are enabled

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

* commit '026c1ac3e7a9f8d465a546c161eac464512cbc62':
  Prevent NPE when no accessibility services are enabled

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 27b64086: am 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue.
John Spurlock [Fri, 17 Oct 2014 16:46:33 +0000 (16:46 +0000)]
am 27b64086: am 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue.

* commit '27b64086fdf6a219c3f66f6c57ad3e4bb3dcc575':
  Settings: Fix hotspot switch state issue.

9 years agoam 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue.
John Spurlock [Fri, 17 Oct 2014 16:41:17 +0000 (16:41 +0000)]
am 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue.

* commit '8d6d8f02fa94ec32d43d7532df2a5d000c0e3edc':
  Settings: Fix hotspot switch state issue.

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 agoam 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17
Sami Tolvanen [Fri, 17 Oct 2014 01:38:05 +0000 (01:38 +0000)]
am 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17
automerge: 0be4088

* commit '0be4088ed9253da04f56999e1560ab522d5d9400':
  Remove excess whitespace from the factory reset screen

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 01:19:35 +0000 (01:19 +0000)]
am 63af7fc7: Remove excess whitespace from the factory reset screen
automerge: c145d17

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

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:49:42 +0000 (22:49 +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 automerge: e6a4a6b
automerge: 570bd52

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

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:43:19 +0000 (22:43 +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
automerge: e6a4a6b

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

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 agoMerge "Refactor the duplicate Switch IME button to an include"
Sami Tolvanen [Thu, 16 Oct 2014 22:24:25 +0000 (22:24 +0000)]
Merge "Refactor the duplicate Switch IME button to an include"

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 8b5b47bf: am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side...
Fabrice Di Meglio [Thu, 16 Oct 2014 21:54:38 +0000 (21:54 +0000)]
am 8b5b47bf: am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

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

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

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

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 e5e08d93: (-s ours) am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721...
Geoff Mendal [Thu, 16 Oct 2014 18:13:05 +0000 (18:13 +0000)]
am e5e08d93: (-s ours) am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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

9 years agoam 5c9c259a: (-s ours) am 1b2ef02c: (-s ours) am a3d19546: (-s ours) am 0172dfef...
Geoff Mendal [Thu, 16 Oct 2014 18:13:04 +0000 (18:13 +0000)]
am 5c9c259a: (-s ours) am 1b2ef02c: (-s ours) am a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

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

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

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

* commit '1b2ef02ce0a00c31cbb8bfa97f24c252e834da16':
  Import translations. DO NOT MERGE

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

* commit '20ef7a70c48967a1a1d6aef8ad81787e1620558b':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Thu, 16 Oct 2014 01:04:59 +0000 (01:04 +0000)]
Merge "Import translations. DO NOT MERGE"

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 01:03:52 +0000 (18:03 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 16 Oct 2014 00:57:10 +0000 (00:57 +0000)]
am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '78c00239df6d858c19a8243ad41ba96967e2fddc':
  Import translations. DO NOT MERGE

9 years agoam 2d45e6c7: (-s ours) am 24f29313: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Thu, 16 Oct 2014 00:56:35 +0000 (00:56 +0000)]
am 2d45e6c7: (-s ours) am 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2d45e6c7389f99dfbdbcbc49b2f3fc149ee4d377':
  Import translations. DO NOT MERGE

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 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Thu, 16 Oct 2014 00:53:20 +0000 (00:53 +0000)]
am 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '24f293138de5e38cb05389db3c6671e02812e9e0':
  Import translations. DO NOT MERGE

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