PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,182 Commits 1 Branch 0 Tags
8fa75e03f74f7dbca3368dd8877d9f94e6335f18
Commit Graph

7847 Commits

Author SHA1 Message Date
Julia Reynolds
cf92ef10a5 Updates to automatic rule listing page for 3P rules. 
Show the provider app icon and name; allow deletion from
listing page; remove the rule summary for consistency.

Bug: 22977552
Change-Id: Ib71832fa4ff64b7321ade39f9964ac52cee6c643
 2015-09-21 11:30:02 -04:00
Jim Miller
e2fb8f1d81 am 93fd2b5c: am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit '93fd2b5c3010b17be5391a1e0ae755e31ec9852c':
  Add summary for 0 fingerprint settings preference
 2015-09-19 18:15:05 +00:00
Justin Harrison
c591cdd69b am fa9d8258: am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit 'fa9d8258d4d186c1aeaf3f79cff892d0a290e6a5':
  Add color transform setting
 2015-09-19 18:14:36 +00:00
Baligh Uddin
2d0db3098e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-19 02:35:07 +00:00
Jim Miller
93fd2b5c30 am 2b620859: am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit '2b6208599d5cd606cc3a685f6ae3d5b9acf5553b':
  Add summary for 0 fingerprint settings preference
 2015-09-19 01:22:40 +00:00
Jim Miller
2b6208599d am 50ee327f: am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit '50ee327fb9606fdc89df9e00558231692951aa90':
  Add summary for 0 fingerprint settings preference
 2015-09-19 01:13:26 +00:00
Jim Miller
50ee327fb9 am d251fed3: Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 
* commit 'd251fed3ef24b02697a375bf32f382338f500f53':
  Add summary for 0 fingerprint settings preference
 2015-09-19 01:08:31 +00:00
Jim Miller
d251fed3ef Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev 2015-09-19 00:59:51 +00:00
Justin Harrison
fa9d8258d4 am 8a44f2c4: am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit '8a44f2c413daf544d932dbbba8f221b655da6011':
  Add color transform setting
 2015-09-19 00:46:06 +00:00
Justin Harrison
8a44f2c413 am a3add1d2: am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit 'a3add1d2086f82c8d176ca0a72a7cbd8b98c19ff':
  Add color transform setting
 2015-09-19 00:37:40 +00:00
Justin Harrison
a3add1d208 am c6a96d40: Merge "Add color transform setting" into mnc-dr-dev 
* commit 'c6a96d4076ecddce57c864683a47e581ca2517f5':
  Add color transform setting
 2015-09-19 00:29:31 +00:00
Jason Monk
0217281d33 Add color transform setting 
Bug: 24038268
Change-Id: I2bf45fef85038c29423a86c7bb018a8e750110a6
 2015-09-18 20:11:01 -04:00
Jim Miller
d433359684 Add summary for 0 fingerprint settings preference 
This allows the fingerprint summary to be shown when there
are no fingerprints.

Fixes bug 24172006

Change-Id: I9dd266013ac74da74f1dd397cbe0e50acf5d1262
 2015-09-18 15:37:48 -07:00
Baligh Uddin
8223038551 Import translations. DO NOT MERGE 
Change-Id: I5ed9e4e1920eab53feb140714646b796d69d193d
Auto-generated-cl: translation import
 2015-09-18 10:37:08 -07:00
Paul Lawrence
e68e93fc36 am 67d0fe4c: am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
  Stop long passwords crashing CryptKeeper
 2015-09-18 15:57:21 +00:00
Paul Lawrence
67d0fe4c0e am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
  Stop long passwords crashing CryptKeeper
 2015-09-18 15:49:04 +00:00
Paul Lawrence
fe9b6d3e2e am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
  Stop long passwords crashing CryptKeeper
 2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581 am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
  Stop long passwords crashing CryptKeeper
 2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78 Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev 2015-09-18 15:26:01 +00:00
Maurice Lam
771fac591f [WifiSettings] Add Wi-Fi dialog activity 
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.

Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:

MODE_VIEW     --  mEdit = false, mModify = *
MODE_CONNECT  --  mEdit = true, mModify = false
MODE_MODIFY   --  mEdit = true, mModify = true

Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
 2015-09-17 16:03:49 -07:00
Paul Lawrence
44985b9ccd Stop long passwords crashing CryptKeeper 
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
 2015-09-16 15:29:57 -07:00
Baligh Uddin
6ea05b747d Import translations. DO NOT MERGE 
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
 2015-09-14 03:20:45 -07:00
Baligh Uddin
eb1c872563 Import translations. DO NOT MERGE 
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
 2015-09-14 02:48:18 -07:00
Baligh Uddin
c0191b5503 Merge "Import translations. DO NOT MERGE" 2015-09-11 16:19:23 +00:00
Baligh Uddin
196555c71b Import translations. DO NOT MERGE 
Change-Id: I60a7b3894ab284a6c336dff438e38767c473ac19
Auto-generated-cl: translation import
 2015-09-10 14:56:41 -07:00
Baligh Uddin
153a69c597 Import translations. DO NOT MERGE 
Change-Id: I8e301f2fd2ee2b4e2e91b5e7f3b910ebf708f7cd
Auto-generated-cl: translation import
 2015-09-10 14:24:34 -07:00
Maurice Lam
6d07779c07 Merge "[ScreenLockSetup] Create separate title string" 2015-09-10 20:57:13 +00:00
Maurice Lam
7d8ebeea94 [ScreenLockSetup] Create separate title string 
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.

Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
 2015-09-10 12:05:14 -07:00
Jorim Jaggi
cb9d7a96bb resolved conflicts for 99bbec73 to master 
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
 2015-09-09 18:48:27 -07:00
Jorim Jaggi
99bbec733d am f37368db: am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'f37368db841ce534cc1712b54b1c88bcbe991756':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:11:44 +00:00
Jorim Jaggi
f37368db84 am ef5f9e39: am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit 'ef5f9e3952ac35df4ce4335be0020ae81b11f746':
  Add double-tap power button to open camera 2/2
 2015-09-10 01:02:39 +00:00
Jorim Jaggi
ef5f9e3952 am 48422b52: Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 
* commit '48422b52f3ed81dd447e6bc836d752f33ef8c7b3':
  Add double-tap power button to open camera 2/2
 2015-09-10 00:53:48 +00:00
Jorim Jaggi
48422b52f3 Merge "Add double-tap power button to open camera 2/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jim Miller
a04ebb412c am eddb0493: am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache 
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:22:50 +00:00
Jim Miller
eddb04934b am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRIN 
* commit '93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:14:27 +00:00
Jim Miller
93b39ff9bd am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO 
* commit '01f44efab0673e8648470c8be1670730660a4778':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:08:06 +00:00
Jim Miller
01f44efab0 am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro 
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
 2015-09-09 23:02:34 +00:00
Jorim Jaggi
cc1e9f7ce7 Add double-tap power button to open camera 2/2 
Bug: 23787555
Change-Id: I04787cd863212b1ed9608a6c8bd02af13273b387
 2015-09-09 22:40:00 +00:00
Jim Miller
457904634c Handle fp enrollment errors more gracefully 
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.

Fixes bug 23546104
Fixes bug 22708384

Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
 2015-09-09 15:30:40 -07:00
Alan Viverette
a49cce4f38 Rename night mode back to Night mode 
Which is technically correct (the best correct) and appropriately
manages user expectations.

Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
 2015-09-09 10:27:52 -04:00
Julia Reynolds
ec037c387d Merge "Differentiate battery optimization string." 2015-09-08 17:14:02 +00:00
Julia Reynolds
f08185b8e3 Differentiate battery optimization string. 
Bug: 23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
 2015-09-08 12:49:32 -04:00
Robin Lee
b5e37f1d45 Merge "Show installed user keys in Security Settings" 2015-09-08 16:03:26 +00:00
Geoff Mendal
f1a62026b8 Import translations. DO NOT MERGE 
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
 2015-09-07 08:35:11 -07:00
Geoff Mendal
76381c3f42 Import translations. DO NOT MERGE 
Change-Id: Ide5e5bf4e5da66bfb8246f90da690f447db2e411
Auto-generated-cl: translation import
 2015-09-07 07:49:54 -07:00
Maurice Lam
8d6975eb25 Merge "Update setup wizard skip dialog strings" 2015-09-04 19:30:26 +00:00
Maurice Lam
21d27b125f Update setup wizard skip dialog strings 
Change "Don't skip" to "Go back".

Bug: 23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
 2015-09-04 00:36:43 +00:00
Xiaohui Chen
40aca2ceb4 Remove dead Nsd checkbox 
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.

Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
 2015-09-03 11:29:45 -07:00
Maurice Lam
321b27b67c am 570852da: am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit '570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
  [Fingerprint] Update strings for skip dialog
 2015-09-03 17:28:44 +00:00
Sungmin Choi
56042b8c36 am eeb5f8f1: am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config 
* commit 'eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
  To hide none security option, use config_hide_none_security_option config
 2015-09-03 17:28:43 +00:00