git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Thu, 16 Oct 2014 22:03:10 +0000 (23:03 +0100)]

Move up spinner in apps screen

Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Tue, 21 Oct 2014 16:49:23 +0000 (16:49 +0000)]

Merge "Reset spinner selection" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:57:55 +0000 (23:57 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:45:43 +0000 (23:45 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 20 Oct 2014 23:42:29 +0000 (23:42 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]

Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]

Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jim Miller [Fri, 17 Oct 2014 19:04:21 +0000 (12:04 -0700)]

Add strings for upcoming change.

Fixes bug 17881324

Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

John Spurlock [Fri, 17 Oct 2014 15:54:16 +0000 (11:54 -0400)]

Settings: Fix hotspot switch state issue.

Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help