Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,501 Commits 1 Branch 0 Tags
225fc3a83dc5c4d8d5fa3ccb91b3d1793af98397
Commit Graph

1921 Commits

Author SHA1 Message Date
Jim Miller
225fc3a83d am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003 
automerge: 8baf923

* commit '8baf92359b0661b067de85e73d275f0421fc768a':
  Fix bad string in EncryptionInterstitial
 2014-10-18 03:32:10 +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
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
Amith Yamasani
4c9adf36f8 am d8bdc10c: am 8a9a55ac: am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff. 
* commit 'd8bdc10c721fdd6a4568d285ea6b506c6ea3a6a0':
  Fix some strings for the encryption stuff.
 2014-10-17 21:28:52 +00:00
Jim Miller
84bef7fc46 am 40fbd26a: am ae2ee1dd: am 0303bb20: am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit '40fbd26a40a85a7f820ef58d4cc3c3d648e23ae6':
  Add strings for upcoming change.
 2014-10-17 21:28:42 +00:00
Svetoslav
e90cde72ca am 8cfd94de: am dfa12ed4: am b363c26e: am 431e2460: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption. 
* commit '8cfd94de1dcbe707f3747cc9515e4c3562f6b092':
  User to confirm credentials if an accessibility service changes encryption.
 2014-10-17 21:28:41 +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
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
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
0303bb2030 am c7ccba68: am 4f903c3e: Add strings for upcoming change. 
* commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a':
  Add strings for upcoming change.
 2014-10-17 19:56:45 +00:00
Jim Miller
c7ccba6859 am 4f903c3e: Add strings for upcoming change. 
* commit '4f903c3e6502e1a87805a1def69c2a6f44bf601f':
  Add strings for upcoming change.
 2014-10-17 19:52:03 +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
b363c26e2f 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.
 2014-10-17 18:53:32 +00:00
Svetoslav
431e246032 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:56:40 +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
Jim Miller
69cb6a9001 am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev 
* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 21:23:51 +00:00
Jim Miller
1d050220a0 am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev 
* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 21:02:09 +00:00
Jim Miller
3ef52587da resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev 
Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
 2014-10-15 13:54:37 -07:00
Jason Monk
0bc1f91d5e am d913ef17: am 0f45f64e: am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit 'd913ef17e0ddb3a51d577ea74a2e148b12ed34b9':
  Update screen pinning strings to say Overview
 2014-10-15 03:06:05 +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
Jason Monk
f3a1fae4b6 am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev 
* commit '9e6c6b9fb550390f9488c923827bbf5599dec3c2':
  Update screen pinning strings to say Overview
 2014-10-14 22:51:50 +00:00
Jason Monk
9e6c6b9fb5 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:23 +00:00
Jason Monk
89be2d8ba4 Update screen pinning strings to say Overview 
Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
 2014-10-14 09:29:25 -04:00
Sanket Padawe
ea2e53ead5 am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp 
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
  Removing display number format from SIM UI
 2014-10-10 05:15:52 +00:00
Sanket Padawe
04b8b4c1a4 am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev 
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
  Removing display number format from SIM UI
 2014-10-09 13:03:33 +00:00
Sanket Padawe
770bdd771e Removing display number format from SIM UI 
Removed "Display Number" from the SIM settings UI.

Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469
 2014-10-08 16:05:36 -07:00
Mike Lockwood
3f6ef34b35 Add developer setting for changing the current USB configuration 
This can be useful for testing the audio source kernel driver,
reverse tethering over RNDIS, etc.

Change-Id: I7392f95545cf5ae8a36b4b7b0d37f003df7e70b2
 2014-10-06 10:17:13 -07:00
Elliott Hughes
e6cd6aef23 am 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp 
* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
  Fix percentage formatting throughout Settings.
 2014-10-04 16:43:09 +00:00
PauloftheWest
ff14c67143 am 1713fe25: am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 
* commit '1713fe2524361a2e10b877925bf93053a6cd173d':
  [DS] DSDS support for Settings
 2014-10-04 16:05:46 +00:00
Elliott Hughes
50c377f09f Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev 2014-10-04 00:44:10 +00:00
Svetoslav
7b2a6a47c7 am 4ab0396c: am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '4ab0396c7fbb25033f7c81dc297bafb96778eb3a':
  Update accessibility plus secure lock warning messages.
 2014-10-04 00:01:27 +00:00
Elliott Hughes
83f013cfd4 Fix percentage formatting throughout Settings. 
Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
 2014-10-03 15:52:20 -07:00
PauloftheWest
4046cf9cb4 Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 2014-10-03 22:45:26 +00:00
PauloftheWest
50e6ecacf9 [DS] DSDS support for Settings 
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
 2014-10-03 15:22:59 -07:00
Svetoslav
5cdd3f4f6f Update accessibility plus secure lock warning messages. 
bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
 2014-10-03 13:27:13 -07:00
PauloftheWest
3db132a58f am ebe0125f: am d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'ebe0125fa87588b96df510c7c6ba91ad011d8fc2':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 14:04:49 +00:00
PauloftheWest
6e26427e52 Updated Wi-Fi hotspot dialog to the Material Spec. 
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.

Bug: 17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
 2014-10-02 14:25:03 -07:00
Hui Shu
19a1a8c3f9 am 6abc2c25: am e9a39e28: am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '6abc2c25b568d352de948519e76cbd3a38b77efb':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:47:38 +00:00
Svetoslav
fa9699c13d am 4b2fc1ad: am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '4b2fc1adad9e27b9a78732a87678297834f82e9c':
  Use default encryption password if an accessibility service is enabled.
 2014-10-02 12:47:33 +00:00
Hui Shu
905f9e2f90 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:52 +00:00
Hui Shu
90886b8284 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
 2014-09-30 16:53:36 -07:00
Svetoslav
5244844268 Use default encryption password if an accessibility service is enabled. 
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.

bug:17671790

Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
 2014-09-30 23:03:37 +00:00
Vinit Deshpande
d7d604056b Merge "Separate wifi AP added by applications." 2014-09-27 02:01:13 +00:00
Sky Faber
2d657e3629 Separate wifi AP added by applications. 
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d
 2014-09-27 02:00:36 +00:00
John Spurlock
edb8125abf am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit '2c383942b3fbda90e390cf8975fd3de32a0c007e':
  Settings: Wire up new zen events config option.
 2014-09-23 19:06:42 +00:00
John Spurlock
7e90548836 Settings: Wire up new zen events config option. 
Add a new switch to zen mode settings for the new
events config attribute.

Depends on frameworks/base:
  Iff10df385206ad73c3423ff118c79e94a10918d9

Bug:17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
 2014-09-22 16:45:06 -04:00
PauloftheWest
13a63ef39b am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
  Increase char limit for translation.
 2014-09-17 18:49:59 +00:00
PauloftheWest
3cc81aeabf Increase char limit for translation. 
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
 2014-09-17 08:30:09 -07:00
Edward Jee
170be5c8c8 am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 09:07:06 +00:00