OSDN Git Service
Geoff Mendal [Wed, 22 Oct 2014 23:58:51 +0000 (23:58 +0000)]
am
1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
1303f19b5f11fe492e4531239c28ae807efc2e5b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:58:50 +0000 (23:58 +0000)]
am
04fc60c4: (-s ours) am
8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
04fc60c4d37617eaad6c2b8bb6002c4679bb0f0a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:57:03 +0000 (23:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 22 Oct 2014 23:55:52 +0000 (23:55 +0000)]
am
8e2fb4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
8e2fb4c9c46dc15250c24083a312aeebbbf10d22':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 22 Oct 2014 23:23:27 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Oct 2014 23:22:01 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Wed, 22 Oct 2014 23:20:52 +0000 (16:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
Sanket Padawe [Wed, 22 Oct 2014 21:40:30 +0000 (21:40 +0000)]
am
828f5df0: am
9fbff5a3: am
59dc8d1d: SIM settings display name changes
* commit '
828f5df065320b3f798f64a8b032e5b7c0534a4c':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:40:29 +0000 (21:40 +0000)]
am
23f4c425: am
246273ae: am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
23f4c425a5855e72b0f0f1aa49329c37aef161c7':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:30:29 +0000 (21:30 +0000)]
am
9fbff5a3: am
59dc8d1d: SIM settings display name changes
* commit '
9fbff5a31b4041906c14f2f3d015a1611adb5209':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:30:28 +0000 (21:30 +0000)]
am
246273ae: am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
246273ae35035b99328a5300e84ecb93067627fc':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:27:13 +0000 (21:27 +0000)]
am
eee65f04: am
286e3c46: am
266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
* commit '
eee65f0417e879be499a15d006520b30618cc7c2':
Commit with dialog box but using subinfo records
Sanket Padawe [Wed, 22 Oct 2014 21:22:25 +0000 (21:22 +0000)]
am
59dc8d1d: SIM settings display name changes
* commit '
59dc8d1db4c557ace1ded52122993be2e73f6863':
SIM settings display name changes
Paul Jensen [Wed, 22 Oct 2014 21:22:20 +0000 (21:22 +0000)]
am
a1640daf: am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
a1640daf6202b12e64bcc26647449695f9ef2a61':
Launch browser directly when user selects "Mobile Plan".
Sanket Padawe [Wed, 22 Oct 2014 21:08:13 +0000 (21:08 +0000)]
am
286e3c46: am
266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
* commit '
286e3c4651fa0af76e092ea52349d5ae2235825d':
Commit with dialog box but using subinfo records
Sanket Padawe [Wed, 22 Oct 2014 20:45:40 +0000 (20:45 +0000)]
am
266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
* commit '
266e429657774dc7aa14029629a9e78c942c6104':
Commit with dialog box but using subinfo records
Sanket Padawe [Wed, 22 Oct 2014 18:36:08 +0000 (11:36 -0700)]
SIM settings display name changes
Resubmitting the change for displaying SIM name in SIM settings.
Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
Paul Jensen [Wed, 22 Oct 2014 17:26:58 +0000 (17:26 +0000)]
am
d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit '
d9b8d1803aac44f382e330ea62bc936e049a1aed':
Launch browser directly when user selects "Mobile Plan".
Paul Jensen [Wed, 22 Oct 2014 17:17:00 +0000 (17:17 +0000)]
Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
John Spurlock [Wed, 22 Oct 2014 17:15:24 +0000 (17:15 +0000)]
am
5c1f4155: am
2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
* commit '
5c1f41558f47ce79c3b30448d6f5025669704f06':
Settings: Remove obsolete string: heads_up_enabled_title.
John Spurlock [Wed, 22 Oct 2014 16:42:54 +0000 (16:42 +0000)]
am
2ae90864: Settings: Remove obsolete string: heads_up_enabled_title.
* commit '
2ae908649c5eb4708af1c29cefbf97cfab2cc341':
Settings: Remove obsolete string: heads_up_enabled_title.
John Spurlock [Wed, 22 Oct 2014 15:36:58 +0000 (11:36 -0400)]
Settings: Remove obsolete string: heads_up_enabled_title.
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.
Bug:
14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
Alan Viverette [Wed, 22 Oct 2014 05:19:48 +0000 (05:19 +0000)]
am
2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
automerge:
6a4d223
* commit '
6a4d22389a3f214d73f1d40c5b28966433b656da':
Adjust caption preset picker items dimens for Material
Alan Viverette [Wed, 22 Oct 2014 02:08:12 +0000 (02:08 +0000)]
am
2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
* commit '
2625d8ed8914ccdfd47983f63df800d991ca3f0c':
Adjust caption preset picker items dimens for Material
Alan Viverette [Wed, 22 Oct 2014 01:25:23 +0000 (01:25 +0000)]
Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev
Alexandra Gherghina [Wed, 22 Oct 2014 00:28:07 +0000 (00:28 +0000)]
am
b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
automerge:
3748b94
* commit '
3748b940a3c86377e55d0a505858da2c2fc1cdaa':
Fix user spinner anchor following system ui changes
Alan Viverette [Tue, 21 Oct 2014 23:51:54 +0000 (16:51 -0700)]
Adjust caption preset picker items dimens for Material
BUG:
18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
Alexandra Gherghina [Tue, 21 Oct 2014 22:29:39 +0000 (22:29 +0000)]
am
b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
* commit '
b9d05d6c63c7bdd866b2cfb3e5b549c352d1493f':
Fix user spinner anchor following system ui changes
Alexandra Gherghina [Tue, 21 Oct 2014 22:20:06 +0000 (22:20 +0000)]
Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev
Alexandra Gherghina [Tue, 21 Oct 2014 22:19:36 +0000 (22:19 +0000)]
am
7574ee6a: am
aadc070a: Move up spinner in apps screen
* commit '
7574ee6a257b7d24447a9ec9767b8d985baaafcf':
Move up spinner in apps screen
Alexandra Gherghina [Tue, 21 Oct 2014 22:14:30 +0000 (22:14 +0000)]
am
aadc070a: Move up spinner in apps screen
* commit '
aadc070a35ca47940e9fa964ba68c5ce817202ef':
Move up spinner in apps screen
Sanket Padawe [Tue, 21 Oct 2014 21:56:06 +0000 (21:56 +0000)]
Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
Sanket Padawe [Tue, 21 Oct 2014 21:16:12 +0000 (14:16 -0700)]
Commit with dialog box but using subinfo records
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
Alexandra Gherghina [Thu, 16 Oct 2014 22:03:10 +0000 (23:03 +0100)]
Move up spinner in apps screen
Bug:
18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
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
Paul Jensen [Sat, 18 Oct 2014 02:09:37 +0000 (22:09 -0400)]
Launch browser directly when user selects "Mobile Plan".
Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser. The ConnectivityService
code has since been removed, so just launch the browser directly.
bug:
17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9
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.
OSDN Git Service
