Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,819 Commits 1 Branch 0 Tags
dbb2c3bd4dedf76bdeb40bfec967a6704d7adb00
Commit Graph

2520 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
 2015-09-02 23:44:06 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog 
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
 2015-09-02 14:36:19 -07:00
Maurice Lam
566af8ce2a am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '2fef059543bc859d5723246a635d0e1773f623de':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:48:17 +00:00
Maurice Lam
8cea65f99f am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
  [Fingerprint] Add skip dialog during SUW
 2015-08-28 22:24:52 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW 
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
 2015-08-28 12:39:21 -07:00
Robin Lee
baefdcf9eb Show installed user keys in Security Settings 
This makes removing a particular keyset possible without deleting the
whole keystore along with it.

Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
 2015-08-26 16:22:19 +01:00
Wei Liu
9dde0669f2 am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib. 
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
 2015-08-25 18:45:34 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib. 
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
 2015-08-25 11:02:59 -07:00
Selim Cinek
494bcecba5 am c118c90c: am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits 
* commit 'c118c90c9bda1bdea7f84469988670fab7b48c61':
  Adapted string length translation limits
 2015-08-20 19:59:55 +00:00
Selim Cinek
dba47d0c7f am 19551115: Adapted string length translation limits 
* commit '19551115dbb3d848be084462342d41addeb1caf6':
  Adapted string length translation limits
 2015-08-20 19:04:30 +00:00
Selim Cinek
19551115db Adapted string length translation limits 
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
 2015-08-20 18:57:22 +00:00
Todd Kennedy
9b47830a2d Merge "Fix string for translation" 2015-08-13 19:57:37 +00:00
Todd Kennedy
344c1b8a47 Fix string for translation 
Increase character limit and help provide some additional context for
the strings

Bug: 23175115
Bug: 23173307
Bug: 23172615
Change-Id: I27c67f39323f359744ae3791ea538030820dc0d0
 2015-08-13 12:56:48 -07:00
Julia Reynolds
fcfe3d82d2 Merge "Switch font size from a dialog to dropdown preference." 2015-08-13 14:42:39 +00:00
Julia Reynolds
a02bc9991d Switch font size from a dialog to dropdown preference. 
Bug: 16634975
Change-Id: I8edaf63afe3f43e0bb152428c6ca0c6b1ccd0eb4
 2015-08-13 10:40:29 -04:00
Dianne Hackborn
ca9433519b am a0b5ab0e: am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'a0b5ab0ef6b9525e4bb68bb0ac6c8f3bfb144c9f':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 02:10:09 +00:00
Dianne Hackborn
6a1e1e08a0 am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I003564376a02a70f0245353472544cde355240ac
 2015-08-12 16:11:46 -07:00
Todd Kennedy
c37a80990b Merge "Add force external setting" 2015-08-12 16:53:32 +00:00
Dianne Hackborn
0af26c1dce am 5876e309: am 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '5876e30931915f3dcfcf044e7ce46ca039ace75a':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-12 00:00:20 +00:00
Dianne Hackborn
e2e76435f4 am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:26:45 +00:00
Dianne Hackborn
4f8b829b24 Fix issue #23079119: Description for write settings permission says... 
...it is for read and write

Just write.

And let's say, modify.

Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
 2015-08-11 12:17:59 -07:00
Jason Monk
fe7a25f8fe am 1e29e6b9: am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '1e29e6b9ecb8cadceb6a815464ad3f5e4f6d2138':
  Add setting to disable camera gesture
 2015-08-11 14:20:29 +00:00
Jason Monk
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +00:00
Dianne Hackborn
b05082598c am c7fbbf0d: am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'c7fbbf0d7c9b1fd432dd702c2a46f039c463fd85':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:38:31 +00:00