PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,135 Commits 1 Branch 0 Tags
b72f97c0f18c08972997ddce481b8939566a135c
Commit Graph

16135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
b72f97c0f1 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:45 +00:00
Jim Miller
602d559d9c Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 2014-10-17 23:48:35 +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
fec94660fb 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:04:14 +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
Amith Yamasani
2ae9f8aba6 am e52c159c: Fix some strings for the encryption stuff. 
* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.
 2014-10-17 21:02:51 +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
9a7f7a34ae am 4f903c3e: Add strings for upcoming change. 
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
  Add strings for upcoming change.
 2014-10-17 19:32:09 +00:00
Jim Miller
4f903c3e65 Add strings for upcoming change. 
Fixes bug 17881324

Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
 2014-10-17 12:18:42 -07:00
Svetoslav
c8a1bb5a4d am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 16:55:46 +00:00
Svetoslav
3ea423ae0f 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
 2014-10-16 17:35:07 -07:00
Geoff Mendal
d33f7d6a62 am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4909c412fa8c495f1abba3c7d3fe0c32f08934db':
  Import translations. DO NOT MERGE
 2014-10-16 00:42:05 +00:00
Geoff Mendal
4909c412fa Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 00:38:03 +00:00
Geoff Mendal
c0a4136bbd Import translations. DO NOT MERGE 
Change-Id: I6ddb57a8bea2ad4ad1b6272e1f88f219e9cd8db0
Auto-generated-cl: translation import
 2014-10-15 17:31:39 -07:00
Jim Miller
9afd56e08d am 46c7f6d6: Add a checkbox option to \'require password to decrypt\' 
* commit '46c7f6d6f32efec26bc9343f591ad1ddbe8f3b4a':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:04 +00:00
Jim Miller
46c7f6d6f3 Add a checkbox option to 'require password to decrypt' 
Fixes bug 17881324

Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
 2014-10-14 18:40:30 -07:00
Fabrice Di Meglio
84ff990134 am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev 
* commit '94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
  Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
 2014-10-15 00:43:56 +00:00
Fabrice Di Meglio
94dce76185 Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev 2014-10-15 00:39:58 +00:00
Fabrice Di Meglio
3e825febca Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity 
- prevent IllegalStateException

Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee
 2014-10-14 16:21:22 -07:00
Jason Monk
8b1fe3b8e0 am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit 'eaf84472ea10e0ec34b22faad0438700a86787b9':
  Update screen pinning strings to say Overview
 2014-10-14 22:47:25 +00:00
Jason Monk
eaf84472ea Merge "Update screen pinning strings to say Overview" into lmp-dev 2014-10-14 22:42:49 +00:00
Andres Morales
4a9b3cf506 am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 
* commit '26bc6907b93a21adcdf8ffdc24d7d96482be8165':
  Set layout_width in WiFi+NFC resource
 2014-10-14 22:20:11 +00:00
Andres Morales
26bc6907b9 Merge "Set layout_width in WiFi+NFC resource" into lmp-dev 2014-10-14 22:03:35 +00:00
Andres Morales
c5fdea08d2 Set layout_width in WiFi+NFC resource 
Bug:17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
 2014-10-14 13:49:31 -07:00
Jason Monk
89be2d8ba4 Update screen pinning strings to say Overview 
Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
 2014-10-14 09:29:25 -04:00
vandwalle
60790f7b2a am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 
* commit '2fb9c773761b1375c86963ebb8f3bb3bec18e479':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
 2014-10-14 06:45:00 +00:00
vandwalle
2fb9c77376 Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev 2014-10-14 06:41:27 +00:00
vandwalle
426005a299 dont show a config in saved network if it is self added and we never connected to it 
Bug:17939405

Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
 2014-10-13 18:44:21 -07:00
Geoff Mendal
a9cd186c94 am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e4d510fac1c149784414004803b9d2e2b7b0f7af':
  Import translations. DO NOT MERGE
 2014-10-13 22:19:51 +00:00
Geoff Mendal
e4d510fac1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-13 22:14:10 +00:00
John Spurlock
b3ce7874ff am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts. 
* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
  Fix battery-history-chart large-mode labels in RTL layouts.
 2014-10-13 22:03:08 +00:00
John Spurlock
a312f7f804 Fix battery-history-chart large-mode labels in RTL layouts. 
Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
 2014-10-13 15:48:50 -04:00
Geoff Mendal
b0c0f773ce Import translations. DO NOT MERGE 
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
 2014-10-13 12:32:00 -07:00
Alan Viverette
673e3c28f4 am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev 
* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
  Add option for serif monospace captioning font
 2014-10-10 23:46:06 +00:00
Alan Viverette
178db4d5f7 Merge "Add option for serif monospace captioning font" into lmp-dev 2014-10-10 23:40:58 +00:00
Amit Mahajan
6f451050a7 am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev 
* commit '88b2790d734504389156111002d8c5bd162d9b9c':
  Fix to show signal strength as 0 if out of service.
 2014-10-10 22:44:03 +00:00
Amit Mahajan
88b2790d73 Merge "Fix to show signal strength as 0 if out of service." into lmp-dev 2014-10-10 22:41:09 +00:00
Amit Mahajan
4d49e3f5b1 Fix to show signal strength as 0 if out of service. 
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
 2014-10-10 14:40:44 -07:00
Alan Viverette
48dd1bca69 Add option for serif monospace captioning font 
BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
 2014-10-10 12:24:45 -07:00
Dianne Hackborn
df8683d237 am a4204bde: Merge "Update to use "real" L codename." into lmp-dev 
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
  Update to use "real" L codename.
 2014-10-09 16:57:19 +00:00
Dianne Hackborn
a4204bde45 Merge "Update to use "real" L codename." into lmp-dev 2014-10-09 16:54:16 +00:00
Zoltan Szatmary-Ban
4ce8802e41 am 50263efb: Remove CA Cert UI item from one list only 
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
  Remove CA Cert UI item from one list only
 2014-10-09 12:58:13 +00:00
Zoltan Szatmary-Ban
50263efbaf Remove CA Cert UI item from one list only 
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.

Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
 2014-10-09 13:00:32 +01:00
Dianne Hackborn
308c8fdfec Update to use "real" L codename. 
Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c
 2014-10-08 15:48:25 -07:00
Amith Yamasani
195b15833c am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev 
* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
  Set default restrictions for a newly created user
 2014-10-07 19:58:51 +00:00
Amith Yamasani
742a6803c3 Merge "Set default restrictions for a newly created user" into lmp-dev 2014-10-07 17:41:10 +00:00
Amith Yamasani
a766bfa3de Set default restrictions for a newly created user 
Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.

Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3
 2014-10-07 17:13:16 +00:00
Geoff Mendal
185e17221a am 7096c2dd: (-s ours) Import translations. DO NOT MERGE 
* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
  Import translations. DO NOT MERGE
 2014-10-07 00:08:13 +00:00
Geoff Mendal
7096c2dd0b Import translations. DO NOT MERGE 
Change-Id: I081acd53e6011744f1fdf01403290172ac9ab96f
Auto-generated-cl: translation import
 2014-10-06 16:53:34 -07:00