PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,194 Commits 1 Branch 0 Tags
bc99d35e38b83c7f7a19fd2bf591c15618d6161a
Commit Graph

21194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
fa47bc0290 Update and cleanup FingerprintManager API to new spec 
Fixes bug 21040383

Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
 2015-06-08 17:17:44 -07:00
Tony Mantler
67cd6ab93a Move ApplicationsState to SettingsLib 
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings

b/21328967

Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
 2015-06-08 14:41:02 -07:00
John Spurlock
541e5c410c am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '1b76e7904744a4cde25af73ff9b378d3a765c640':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:28:59 +00:00
John Spurlock
1b76e79047 am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '9a5836107664b796c3ae37c25c89cbf070243edb':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:12:23 +00:00
John Spurlock
9a58361076 Merge "Settings: Update notification listener user prompt strings." into mnc-dev 2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893 Settings: Update notification listener user prompt strings. 
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
 2015-06-08 16:50:36 -04:00
Jorim Jaggi
412a5d15e5 am 89246fd5: am 7e38eea8: Merge "Fix settings overdraw" into mnc-dev 
* commit '89246fd560d1c1f2209c00c1618e5ec6ac432ce1':
  Fix settings overdraw
 2015-06-08 19:02:37 +00:00
Jorim Jaggi
89246fd560 am 7e38eea8: Merge "Fix settings overdraw" into mnc-dev 
* commit '7e38eea8170249ca13c54748d6ba4c615528cad6':
  Fix settings overdraw
 2015-06-08 18:49:06 +00:00
Jorim Jaggi
7e38eea817 Merge "Fix settings overdraw" into mnc-dev 2015-06-08 18:39:25 +00:00
Alex Klyubin
ae86002ad9 am ddd4d074: am abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 
* commit 'ddd4d074380d51d3ca5c83cd1067efa95a2855e3':
  Switch from KeyStore.saw to KeyStore.list.
 2015-06-08 18:38:14 +00:00
Alex Klyubin
ddd4d07438 am abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 
* commit 'abe74683c13f05cc7143c7d4073fcf9a5a829f43':
  Switch from KeyStore.saw to KeyStore.list.
 2015-06-08 18:22:37 +00:00
Alex Klyubin
abe74683c1 Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 2015-06-08 18:11:23 +00:00
Paul Lawrence
a1092fe1ad Move CryptKeeper to own process 
It is possible to run settings from within keyboard, and then find ways of
crashing it. This restarts CryptKeeper since they are one process, with
bad consequences (see bug).

Move to separate process to alleviate this problem

Bug: 21514179
Change-Id: Ib2c19e8f0f3956402cc11a2caedc0a45f786cac3
 2015-06-08 11:00:50 -07:00
Neil Fuller
50024b644b am 7779ef1a: (-s ours) Merge "Revert "Stop showing long names for local timezones when it is ambiguous"" 
* commit '7779ef1a48e1115aa719c65c3809702f19dca5df':
  Revert "Stop showing long names for local timezones when it is ambiguous"
 2015-06-08 17:43:23 +00:00
Neil Fuller
7779ef1a48 Merge "Revert "Stop showing long names for local timezones when it is ambiguous"" 2015-06-08 17:13:43 +00:00
Neil Fuller
eb26cd884f Revert "Stop showing long names for local timezones when it is ambiguous" 
This reverts commit cc4d2c22d4.

Change-Id: I04773f3dd0f2d5756e6901185fe24b5310c5041e
 2015-06-08 17:09:45 +00:00
John Spurlock
2268450147 am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '7db1063958b8192237dec6ffa2de2092ccd0f486':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 17:04:17 +00:00
Geoff Mendal
faad75fbfd am f53cc1d7: (-s ours) am 0053802f: (-s ours) Import translations. DO NOT MERGE 
* commit 'f53cc1d7975295fa3a2fc584e5a051fbf659c948':
  Import translations. DO NOT MERGE
 2015-06-08 17:04:16 +00:00
Martijn Coenen
a048b2c76a am 4504eb36: am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit '4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
  Add NFC payment "how it works" screens.
 2015-06-08 17:04:15 +00:00
Martijn Coenen
73f95c4389 am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev 
* commit 'dcf324c0b3917c8d9007a58bc35591c75793c422':
  NFC: don't use dynamic resources.
 2015-06-08 17:04:14 +00:00
Neil Fuller
df0028ec8a am 91e20200: (-s ours) Merge "Stop showing long names for local timezones when it is ambiguous" 
* commit '91e20200c5532bf4117908223a08ff49666e1a6a':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-08 16:59:00 +00:00
John Spurlock
7db1063958 am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '178d46a9b5cccfa5106028375877b2eb0bf005f7':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 16:52:01 +00:00
Geoff Mendal
f53cc1d797 am 0053802f: (-s ours) Import translations. DO NOT MERGE 
* commit '0053802f23cfad9116f05716d2d5f651c19159ae':
  Import translations. DO NOT MERGE
 2015-06-08 16:44:22 +00:00
Martijn Coenen
4504eb36be am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit '1276b21317d0f86bbd3f59b14d9c0c745cecfa56':
  Add NFC payment "how it works" screens.
 2015-06-08 16:42:41 +00:00
Martijn Coenen
dcf324c0b3 am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev 
* commit '63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9':
  NFC: don't use dynamic resources.
 2015-06-08 16:42:40 +00:00
John Spurlock
178d46a9b5 Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 2015-06-08 16:39:33 +00:00
Alex Klyubin
3848407d0c Switch from KeyStore.saw to KeyStore.list. 
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.

Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
 2015-06-08 09:30:08 -07:00
John Spurlock
a00194d998 Settings: Update DND access dialog to new user flow. 
- Only list apps in the DND access list that have included
   the corresponding permission in their manifest.
 - Show a scary user warning before enabling access per app.
 - Update manifest to follow framework intent action rename.

Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
 2015-06-08 12:27:03 -04:00
Rubin Xu
d1ce82ae8b Defensively load untrusted icons from account authenticator 
Catch Resources.NotFoundException which should cover all parsing
errors from loadDrawables(); also substitute a default icon if
parsing returns null.

Bug: 17760671
Change-Id: Ia0ec25e34974ed85b6ffe6882d5bce003d64e9d6
 2015-06-08 17:21:19 +01:00
Geoff Mendal
0053802f23 Import translations. DO NOT MERGE 
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
 2015-06-08 07:59:45 -07:00
Neil Fuller
91e20200c5 Merge "Stop showing long names for local timezones when it is ambiguous" 2015-06-08 09:36:20 +00:00
Martijn Coenen
1276b21317 Merge "Add NFC payment "how it works" screens." into mnc-dev 2015-06-08 08:02:30 +00:00
Martijn Coenen
63f7fc8847 Merge "NFC: don't use dynamic resources." into mnc-dev 2015-06-08 08:01:48 +00:00
The Android Automerger
b12afbee46 merge in mnc-release history after reset to mnc-dev 2015-06-06 01:04:57 -07:00
Sanket Padawe
7e7376bf75 am ca324f5a: am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit 'ca324f5abf12bab607c74c5aaa0c5e256c5dcefc':
  Fix wifi network strings shown in Settings.
 2015-06-06 02:21:16 +00:00
Sanket Padawe
ca324f5abf am 547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev 
* commit '547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
  Fix wifi network strings shown in Settings.
 2015-06-06 02:09:10 +00:00
Sanket Padawe
547089c376 Merge "Fix wifi network strings shown in Settings." into mnc-dev 2015-06-06 01:58:20 +00:00
Sanket Padawe
2816e4e3e0 Fix wifi network strings shown in Settings. 
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
 2015-06-05 18:49:12 -07:00
Jorim Jaggi
1fdd4f521c Fix settings overdraw 
Bug: 17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
 2015-06-05 17:42:32 -07:00
Ruben Brunk
2585210c8d am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'bf4938166fc539d348dfb8167b03637fecf4d6c0':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:29:46 +00:00
Ruben Brunk
bf4938166f am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit 'e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:16:22 +00:00
Ruben Brunk
e35df2ff3b Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
 2015-06-05 16:05:18 -07:00
Martijn Coenen
cbcc76e8d3 Add NFC payment "how it works" screens. 
Bug: 21239081
Bug: 21305138
Bug: 21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
 2015-06-05 21:35:55 +02:00
Maurice Lam
32d1728aa3 am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 
* commit 'e8f39de661a4a22ced8c72677f53f5420792736e':
  Update Setup Wizard redaction interstitial styles
 2015-06-05 19:34:20 +00:00
Maurice Lam
e8f39de661 am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 
* commit '26a42d1099fece0bc388db2b923ad5c5411bd4f3':
  Update Setup Wizard redaction interstitial styles
 2015-06-05 19:22:46 +00:00
Maurice Lam
26a42d1099 Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev 2015-06-05 19:13:18 +00:00
Jorim Jaggi
3975dbc5e8 am 685a359c: am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev 
* commit '685a359ca1b3a20fcdc8dae92a5a050c2a7ea3bd':
  Fix lockpattern weirdness
 2015-06-05 18:39:14 +00:00
Jorim Jaggi
685a359ca1 am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev 
* commit '5ae7cf3a144d1a55fcd40e84567408caf1ced9f4':
  Fix lockpattern weirdness
 2015-06-05 18:26:21 +00:00
Jorim Jaggi
5ae7cf3a14 Merge "Fix lockpattern weirdness" into mnc-dev 2015-06-05 18:12:17 +00:00