PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,679 Commits 1 Branch 0 Tags
e926cd5cc4ef8d4ef858bc6c7d68e12f32aabac6
Commit Graph

15679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
e926cd5cc4 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.
 2014-10-21 16:19:46 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Geoff Mendal
46de83aa1c am cd617f6c: (-s ours) am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit 'cd617f6cbef7e3449648b26bf37d44422b719937':
  Import translations. DO NOT MERGE
 2014-10-20 23:51:32 +00:00
Geoff Mendal
cd617f6cbe am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
  Import translations. DO NOT MERGE
 2014-10-20 23:47:51 +00:00
Geoff Mendal
6e08ea265b am 50d4d2d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '50d4d2d39a041fcb2ee0c56d9425650e2f8557bd':
  Import translations. DO NOT MERGE
 2014-10-20 23:47:40 +00:00
Geoff Mendal
c25c92cccd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 23:45:44 +00:00
Geoff Mendal
ac9623c69a Import translations. DO NOT MERGE 
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
 2014-10-20 16:44:24 -07:00
Geoff Mendal
50d4d2d39a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-20 23:42:30 +00:00
Geoff Mendal
6acdd044d7 am 795c8378: (-s ours) Import translations. DO NOT MERGE 
* commit '795c83780752d0301985d53e2e230c2088af825b':
  Import translations. DO NOT MERGE
 2014-10-20 23:41:26 +00:00
Geoff Mendal
0019c6af93 Import translations. DO NOT MERGE 
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
 2014-10-20 16:40:41 -07:00
Geoff Mendal
795c837807 Import translations. DO NOT MERGE 
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
 2014-10-20 16:33:09 -07:00
Sanket Padawe
4bcd973db1 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
 2014-10-20 20:56:27 +00:00
Sanket Padawe
fbde761930 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
 2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516 Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597 Changing settings UI changes related to strings to be displayed 
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
 2014-10-20 12:33:50 -07:00
John Spurlock
9a940cbf04 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
 2014-10-20 14:22:38 -04:00
Baligh Uddin
5e9e0f0b74 am 1768f1aa: (-s ours) am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '1768f1aa6398ef2261f85df3b5581568844f39bc':
  Import translations. DO NOT MERGE
 2014-10-19 20:09:04 +00:00
Baligh Uddin
1768f1aa63 am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942':
  Import translations. DO NOT MERGE
 2014-10-19 20:02:59 +00:00
Baligh Uddin
96a0370a2b am 25149b38: (-s ours) Import translations. DO NOT MERGE 
* commit '25149b389501afc817f1248d704def0b4c5b5c04':
  Import translations. DO NOT MERGE
 2014-10-19 19:57:23 +00:00
Baligh Uddin
25149b3895 Import translations. DO NOT MERGE 
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
 2014-10-19 10:10:53 -07: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
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
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
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
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
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
ba202e9fb2 Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev 2014-10-17 22:59:43 +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
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
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
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
Fabrice Di Meglio
27c0b548ab Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-17 20:46:32 +00:00
Amith Yamasani
e52c159cd9 Fix some strings for the encryption stuff. 
Bug: 17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
 2014-10-17 13:42:14 -07:00
Jim Miller
ae2ee1dd05 am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit '0303bb203059e75c729804405d481bd3333c4098':
  Add strings for upcoming change.
 2014-10-17 20:02:22 +00:00