Commit Graph

18779 Commits

Author SHA1 Message Date
Jim Miller
225fc3a83d am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003
automerge: 8baf923

* commit '8baf92359b0661b067de85e73d275f0421fc768a':
  Fix bad string in EncryptionInterstitial
2014-10-18 03:32:10 +00:00
Jim Miller
880e49da16 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
2014-10-18 03:32:04 +00:00
Jim Miller
8baf92359b am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
automerge: c8b2003

* commit 'c8b20033de1af626d68ca049077e327e839fbb5b':
  Fix bad string in EncryptionInterstitial
2014-10-18 03:06:26 +00:00
Jim Miller
34927f8a1e am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
automerge: 06810c4

* commit '06810c482834a27975da050db32f3d2c27fbe793':
  Show warning dialog when Accessibility is enabled
2014-10-18 03:06:19 +00:00
Jim Miller
c8b20033de am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:35:43 +00:00
Jim Miller
3d3c870374 am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:20:59 +00:00
Jim Miller
cd8971a9e9 am aa037675: Fix bad string in EncryptionInterstitial
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:11:05 +00:00
Jim Miller
456b866c09 am aa037675: Fix bad string in EncryptionInterstitial
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:09:26 +00:00
Jim Miller
06810c4828 am 138d7b62: am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
* commit '138d7b6273bdf2f9eb6eb2a55eeae3d6d5c93cf6':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:45:40 +00:00
Jim Miller
138d7b6273 am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:31:03 +00:00
Jim Miller
aa03767598 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
2014-10-17 18:28:52 -07:00
Jim Miller
bc0e5e2684 am 47adff0a: Show warning dialog when Accessibility is enabled
* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:20:53 +00:00
Jim Miller
7b13fe8f90 am 47adff0a: Show warning dialog when Accessibility is enabled
* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:17:34 +00:00
Jim Miller
47adff0a8b 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
2014-10-17 17:43:18 -07:00
Jim Miller
209e020850 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.
2014-10-18 00:12:14 +00:00
Jim Miller
4d14cb67ad 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.
2014-10-18 00:07:36 +00:00
Jim Miller
05656a369d am 3221a342: am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '3221a342117bc3fd366e3f6520db0cb0672bb1f1':
  Several fixes to new EncryptionInterstitial dialog.
2014-10-18 00:03:07 +00:00
Jim Miller
3221a34211 am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
  Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:57:34 +00:00
Jim Miller
b72f97c0f1 am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:52:45 +00:00
Jim Miller
ba1b33407d am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:52:42 +00:00
Jim Miller
602d559d9c Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 2014-10-17 23:48:35 +00:00
Svetoslav
d9cac4f76f 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).
2014-10-17 23:29:36 +00:00
Svetoslav
6dc6567fef 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).
2014-10-17 23:24:09 +00:00
Svetoslav
1a45ee8d78 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).
2014-10-17 23:19:09 +00:00
Svetoslav
1f39d6a6e7 am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'edbada7acd2d40db1c472e291f3191c6f26d980a':
  Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:14:01 +00:00
Jim Miller
0698a21631 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
2014-10-17 16:11:59 -07:00
Svetoslav
edbada7acd am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
  Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:08:40 +00:00
Svetoslav
fec94660fb am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
  Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:04:14 +00:00
Svetoslav
ba202e9fb2 Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev 2014-10-17 22:59:43 +00:00
Fabrice Di Meglio
01f144f70a 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
2014-10-17 21:46:49 +00:00
Fabrice Di Meglio
065c5906bd 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
2014-10-17 21:42:00 +00:00
Svetoslav
40ca78f6f3 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
2014-10-17 14:41:58 -07:00
Fabrice Di Meglio
6e7216ab78 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
2014-10-17 21:36:55 +00:00
Fabrice Di Meglio
140b46e43c Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-17 21:32:34 +00:00
Amith Yamasani
4c9adf36f8 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.
2014-10-17 21:28:52 +00:00
Fabrice Di Meglio
213a790bf7 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
2014-10-17 21:28:51 +00:00
Fabrice Di Meglio
71b2c07877 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
2014-10-17 21:28:50 +00:00
Jim Miller
84bef7fc46 am 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change.
* commit '40fbd26a40a85a7f820ef58d4cc3c3d648e23ae6':
  Add strings for upcoming change.
2014-10-17 21:28:42 +00:00
Svetoslav
e90cde72ca 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.
2014-10-17 21:28:41 +00:00
Amith Yamasani
d8bdc10c72 am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
* commit '8a9a55acae4d74b593bb48777203270d60740932':
  Fix some strings for the encryption stuff.
2014-10-17 21:17:20 +00:00
Amith Yamasani
8a9a55acae am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
* commit '8536d6cfe9952415a2186011b6cebfb7d2c0ee91':
  Fix some strings for the encryption stuff.
2014-10-17 21:13:23 +00:00
Amith Yamasani
8536d6cfe9 am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
* commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb':
  Fix some strings for the encryption stuff.
2014-10-17 21:08:11 +00:00
Fabrice Di Meglio
44db45ac11 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
2014-10-17 14:06:22 -07:00
Fabrice Di Meglio
693046d578 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
2014-10-17 21:06:04 +00:00
Amith Yamasani
2ae9f8aba6 am e52c159c: Fix some strings for the encryption stuff.
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.
2014-10-17 21:02:51 +00:00
Amith Yamasani
06a314d65a am e52c159c: Fix some strings for the encryption stuff.
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.
2014-10-17 21:02:34 +00:00
Fabrice Di Meglio
b3c1c09528 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
2014-10-17 21:00:51 +00:00
Fabrice Di Meglio
dd6c3cc2b4 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
2014-10-17 20:58:14 +00:00
Fabrice Di Meglio
dd89d6d570 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
2014-10-17 20:53:16 +00:00
Fabrice Di Meglio
5c467bc615 Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev 2014-10-17 20:52:56 +00:00