summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2084-697/+2685
|\
| * Import translations. DO NOT MERGEGeoff Mendal2014-10-2084-697/+2685
| | | | | | | | | | Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8 Auto-generated-cl: translation import
* | am bdedbb85: Merge "Changing settings UI changes related to strings to be ↵Sanket Padawe2014-10-202-6/+12
|\ \ | |/ |/| | | | | | | | | displayed" into lmp-sprout-dev * commit 'bdedbb851699016a70eafdb82b038240646358c8': Changing settings UI changes related to strings to be displayed
| * Merge "Changing settings UI changes related to strings to be displayed" into ↵Sanket Padawe2014-10-202-6/+12
| |\ | | | | | | | | | lmp-sprout-dev
| | * Changing settings UI changes related to strings to be displayedSanket Padawe2014-10-202-6/+12
| | | | | | | | | | | | Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
* | | am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942': Import translations. DO NOT MERGE
| * | am 25149b38: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '25149b389501afc817f1248d704def0b4c5b5c04': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-10-1984-798/+3053
| | | | | | | | | | | | | | | | | | | | Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673 Auto-generated-cl: translation import
* | | | am 456b866c: am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-182-4/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec': Fix bad string in EncryptionInterstitial
| * | | am aa037675: Fix bad string in EncryptionInterstitialJim Miller2014-10-182-4/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'aa0376759873893197a0109025fd4ec8beca5929': Fix bad string in EncryptionInterstitial
| | * | Fix bad string in EncryptionInterstitialJim Miller2014-10-172-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabledJim Miller2014-10-181-11/+71
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d': Show warning dialog when Accessibility is enabled
| * | | am 47adff0a: Show warning dialog when Accessibility is enabledJim Miller2014-10-181-11/+71
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0': Show warning dialog when Accessibility is enabled
| | * | Show warning dialog when Accessibility is enabledJim Miller2014-10-171-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shows a warning dialog in EncryptionInterstitial when the user selects "Require password". Fixes bug 17881324 Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
* | | | am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial ↵Jim Miller2014-10-176-41/+91
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | dialog." into lmp-dev * commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7': Several fixes to new EncryptionInterstitial dialog.
| * | | am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." ↵Jim Miller2014-10-176-41/+91
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '602d559d9c59074664ad684579dc3d14a09219cb': Several fixes to new EncryptionInterstitial dialog.
| | * | Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-devJim Miller2014-10-176-41/+91
| | |\ \
| | | * | Several fixes to new EncryptionInterstitial dialog.Jim Miller2014-10-176-41/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong ↵Svetoslav2014-10-172-3/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | encryption (Settings)." into lmp-dev * commit 'edbada7acd2d40db1c472e291f3191c6f26d980a': Accessibility no longer overrides strong encryption (Settings).
| * | | | am ba202e9f: Merge "Accessibility no longer overrides strong encryption ↵Svetoslav2014-10-172-3/+16
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | (Settings)." into lmp-dev * commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380': Accessibility no longer overrides strong encryption (Settings).
| | * | | Merge "Accessibility no longer overrides strong encryption (Settings)." into ↵Svetoslav2014-10-172-3/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-dev
| | | * | | Accessibility no longer overrides strong encryption (Settings).Svetoslav2014-10-172-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to ↵Fabrice Di Meglio2014-10-172-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Quantum/Material on/off switch" into lmp-mr1-dev
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material ↵Fabrice Di Meglio2014-10-172-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on/off switch Per UX request, convert Trusted Credentials CheckBoxes to Switches Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
* | | | | | | am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '06a314d65ad1583e76394d6c5846e3bbfd8eedcb': Fix some strings for the encryption stuff.
| * | | | | | am e52c159c: Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6': Fix some strings for the encryption stuff.
| | * | | | | Fix some strings for the encryption stuff.Amith Yamasani2014-10-171-9/+9
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 17881324 Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
* | | | | | Merge "Fix bug #18024258 Crash in Settings observed after tap on Usage ↵Fabrice Di Meglio2014-10-171-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | statistics" into lmp-mr1-dev
| * | | | | | Fix bug #18024258 Crash in Settings observed after tap on Usage statisticsFabrice Di Meglio2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update to correct class name (was changed in a former CL and introduced this regression) Change-Id: Ia945a5be2d8c7d19c1daf400a9d2d2a6589de137
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to ↵Fabrice Di Meglio2014-10-173-35/+35
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Quantum/Material on/off switch" into lmp-mr1-dev
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material ↵Fabrice Di Meglio2014-10-163-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on/off switch Per UX request, convert Account Sync feeds CheckBoxes to Switches Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
* | | | | | | am c7ccba68: am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a': Add strings for upcoming change.
| * | | | | | am 4f903c3e: Add strings for upcoming change.Jim Miller2014-10-171-3/+30
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f': Add strings for upcoming change.
| | * | | | | Add strings for upcoming change.Jim Miller2014-10-171-3/+30
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 17881324 Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
* | | | | | am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility ↵Svetoslav2014-10-178-15/+103
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service changes encryption. * commit '431e246032d58b8aae72d348107f0d2aaa9efbac': User to confirm credentials if an accessibility service changes encryption.
| * | | | | am 3ea423ae: User to confirm credentials if an accessibility service changes ↵Svetoslav2014-10-178-15/+103
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption. * commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d': User to confirm credentials if an accessibility service changes encryption.
| | * | | | User to confirm credentials if an accessibility service changes encryption.Svetoslav2014-10-168-15/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-devAlan Viverette2014-10-171-2/+3
|\ \ \ \ \ \
| * | | | | | Prevent NPE when no accessibility services are enabledAlan Viverette2014-10-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18023183 Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
* | | | | | | Settings: Fix hotspot switch state issue.John Spurlock2014-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17967405 Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
* | | | | | | Remove excess whitespace from the factory reset screenSami Tolvanen2014-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix bug #18017952 It does not search all possible "USB" results that ↵Fabrice Di Meglio2014-10-163-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | can be found in the settings" into lmp-mr1-dev
| * | | | | | | Fix bug #18017952 It does not search all possible "USB" results that can be ↵Fabrice Di Meglio2014-10-163-4/+14
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix bug #15730311 Checkboxes on R side should update to ↵Fabrice Di Meglio2014-10-1614-61/+43
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Quantum/Material on/off switch" into lmp-mr1-dev
| * | | | | | Fix bug #15730311 Checkboxes on R side should update to Quantum/Material ↵Fabrice Di Meglio2014-10-1514-61/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on/off switch Per UX request, convert more CheckBoxes to Switches Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
* | | | | | | am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-10-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-sprout-dev * commit '9f0d372154fc328315dad2f7df2290345bebcf39': Import translations. DO NOT MERGE
| * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-1678-282/+419
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-1578-282/+419
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd58c7a54faef6216bf534dac6d5fe99340d0083 Auto-generated-cl: translation import
* | | | | | | am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2014-10-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '0172dfef41dbd728b603d470bc4650290a2276b4': Import translations. DO NOT MERGE
| * | | | | | am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-160-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2025-02-11 22:57:29 +0000