OSDN Git Service
Alexandra Gherghina [Tue, 21 Oct 2014 16:58:22 +0000 (16:58 +0000)]
am
8af56164: am
2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
* commit '
8af561648450062dcd536eed44b3b774565f3356':
Reset spinner selection
Geoff Mendal [Tue, 21 Oct 2014 16:58:21 +0000 (16:58 +0000)]
am
d66d7e51: (-s ours) am
c69ed5e0: (-s ours) am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
d66d7e519fa3e0f5c847d880946350c52bc91ebc':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 21 Oct 2014 16:55:03 +0000 (16:55 +0000)]
am
2f90c4cd: Merge "Reset spinner selection" into lmp-mr1-dev
* commit '
2f90c4cd52326b712e4f886976f27d6610162a82':
Reset spinner selection
Geoff Mendal [Tue, 21 Oct 2014 16:50:12 +0000 (16:50 +0000)]
am
c69ed5e0: (-s ours) am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c69ed5e09f9f53ebf9462b2bad91f6742e827bca':
Import translations. DO NOT MERGE
Alexandra Gherghina [Tue, 21 Oct 2014 16:49:23 +0000 (16:49 +0000)]
Merge "Reset spinner selection" into lmp-mr1-dev
Geoff Mendal [Tue, 21 Oct 2014 16:40:56 +0000 (16:40 +0000)]
am
eda5136b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
eda5136ba2ded67fc82646a63dbd5ab06134adf2':
Import translations. DO NOT MERGE
John Spurlock [Tue, 21 Oct 2014 16:32:29 +0000 (16:32 +0000)]
am
e926cd5c: am
196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev
* commit '
e926cd5cc4ef8d4ef858bc6c7d68e12f32aabac6':
Settings: Display 'Calls' category on non-voice devices.
John Spurlock [Tue, 21 Oct 2014 16:19:46 +0000 (16:19 +0000)]
am
196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev
* commit '
196aacebf9ac9dd4ffedc3012f59285be499e470':
Settings: Display 'Calls' category on non-voice devices.
John Spurlock [Tue, 21 Oct 2014 16:11:11 +0000 (16:11 +0000)]
Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev
Geoff Mendal [Mon, 20 Oct 2014 23:57:55 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 20 Oct 2014 23:57:34 +0000 (23:57 +0000)]
am
46de83aa: (-s ours) am
cd617f6c: (-s ours) am
6acdd044: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
46de83aa1c9f34e76706ba4250c69f2933a5d3c0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:53:41 +0000 (23:53 +0000)]
am
6e08ea26: (-s ours) am
50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
6e08ea265b497a3c3d29a1e37ae5fc826879c901':
Import 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
Geoff Mendal [Mon, 20 Oct 2014 23:51:32 +0000 (23:51 +0000)]
am
cd617f6c: (-s ours) am
6acdd044: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
cd617f6cbef7e3449648b26bf37d44422b719937':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:49:08 +0000 (23:49 +0000)]
am
c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c25c92cccda2f8b1bb02c99f2cf596a703e6c2ce':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:47:51 +0000 (23:47 +0000)]
am
6acdd044: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:47:40 +0000 (23:47 +0000)]
am
50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
50d4d2d39a041fcb2ee0c56d9425650e2f8557bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:45:43 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 20 Oct 2014 23:44:24 +0000 (16:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 23:42:29 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
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
Geoff Mendal [Mon, 20 Oct 2014 23:40:41 +0000 (16:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
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
Sanket Padawe [Mon, 20 Oct 2014 21:01:53 +0000 (21:01 +0000)]
am
4bcd973d: am
fbde7619: am
bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
* commit '
4bcd973db125d775b88d28e5a3c77ba739cf3d9d':
Changing settings UI changes related to strings to be displayed
Sanket Padawe [Mon, 20 Oct 2014 20:56:27 +0000 (20:56 +0000)]
am
fbde7619: am
bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
* commit '
fbde761930f23efd4102c983b430c35a615b71d9':
Changing settings UI changes related to strings to be displayed
Sanket Padawe [Mon, 20 Oct 2014 20:51:07 +0000 (20:51 +0000)]
am
bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
* commit '
bdedbb851699016a70eafdb82b038240646358c8':
Changing settings UI changes related to strings to be displayed
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
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
John Spurlock [Mon, 20 Oct 2014 18:22:38 +0000 (14:22 -0400)]
Settings: Display 'Calls' category on non-voice devices.
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.
Bug:
17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
Baligh Uddin [Sun, 19 Oct 2014 20:16:23 +0000 (20:16 +0000)]
am
5e9e0f0b: (-s ours) am
1768f1aa: (-s ours) am
96a0370a: (-s ours) am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
5e9e0f0b74298d0992be36a371090f6879e0da92':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:09:04 +0000 (20:09 +0000)]
am
1768f1aa: (-s ours) am
96a0370a: (-s ours) am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
1768f1aa6398ef2261f85df3b5581568844f39bc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 20:02:59 +0000 (20:02 +0000)]
am
96a0370a: (-s ours) am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
96a0370a2b893fb8acb1c1bd6873cecf05da7942':
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
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
Jim Miller [Sat, 18 Oct 2014 03:06:26 +0000 (03:06 +0000)]
am
3d3c8703: am
456b866c: am
aa037675: Fix bad string in EncryptionInterstitial
automerge:
c8b2003
* commit '
c8b20033de1af626d68ca049077e327e839fbb5b':
Fix bad string in EncryptionInterstitial
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
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
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
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
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
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
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
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
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
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.
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.
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.
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.
Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
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).
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).
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).
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
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).
Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
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
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
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
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
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.
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.
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.
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
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
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.
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
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
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
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
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
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
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.
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.
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.
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.
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.
Jim Miller [Fri, 17 Oct 2014 19:04:21 +0000 (12:04 -0700)]
Add strings for upcoming change.
Fixes bug
17881324
Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
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.
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.
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
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
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
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
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.
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.
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.
John Spurlock [Fri, 17 Oct 2014 15:54:16 +0000 (11:54 -0400)]
Settings: Fix hotspot switch state issue.
Bug:
17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
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
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
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
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
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
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
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
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
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
Alexandra Gherghina [Thu, 18 Sep 2014 09:59:43 +0000 (10:59 +0100)]
Reset spinner selection
This makes sure that when you go back to the spinner screen, the
selection is the one corresponding to the current profile.
Bug:
17378446
Change-Id: I536cc2701f9481986a63df1b01a38151edf2fa83
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
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
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