Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,888 Commits 1 Branch 0 Tags
10593796f0fa58ec7b41547651c4541bbbf94de5
Commit Graph

7803 Commits

Author SHA1 Message Date
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
Zachary Kuznia
5adcb3d353 Allow manual to be read from disk 
b/22891924

Change-Id: I6014690735403b772f273addba01706441898e23
 2015-08-17 18:20:37 -07: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
Dianne Hackborn
fc7633cae2 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:11:09 +00:00
Dianne Hackborn
9bedd25c77 Fix issue #23037720: New Battery Optimization Strings 
No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
 2015-08-10 17:03:38 -07:00
Jorim Jaggi
9a2af1ad7a Fix fingerprint string descriptions 
Change-Id: I83d4c89d9a060871117f8ec8cd72f36c1f3cf3a4
 2015-08-10 23:08:27 +00:00
Todd Kennedy
97162821f9 Add force external setting 
Adds a developer setting that overrides the package's storage
preference. This allows any [non-system] package to be moved
to external storage.

Bug: 22282121
Change-Id: Ie21bc13b1d92fe0972f789a2187e11d2e413f040
 2015-08-10 09:50:28 -07:00
Dianne Hackborn
eb8d922c37 am 81a3ef13: am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '81a3ef139b3f607562b784430fe2748f3eff9713':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-08 02:49:34 +00:00
Dianne Hackborn
7a3a453349 am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-07 22:05:56 +00:00
Dianne Hackborn
f5497aa93c Fix issue #23037720: New Battery Optimization Strings 
Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
 2015-08-07 14:43:55 -07:00
Maurice Lam
ac663863e5 am 177cebf7: am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling 
* commit '177cebf7e32632bb493fab0f157f7fe4827c0572':
  [Fingerprint] Update string for enrolling
 2015-08-04 23:56:34 +00:00
Maurice Lam
c48ea1f586 [Fingerprint] Update string for enrolling 
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.

Also include other minor update to strings mentioned in the bug.

Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
 2015-08-04 23:08:10 +00:00
Maurice Lam
289151ccea [Fingerprint] Update string for enrolling 
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.

Also include other minor update to strings mentioned in the bug.

Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
 2015-08-04 15:44:42 -07:00
Jason Monk
5d402d59bc am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev 
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
  Update USB dialog for USB-C power option
 2015-08-04 18:23:57 +00:00
Jason Monk
d30e426976 Add setting to disable camera gesture 
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
 2015-08-04 11:30:50 -04:00
Jason Monk
83290eef8c Update USB dialog for USB-C power option 
Also includes a bit of visual updates, options now have summaries
as well.

Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.

Currently devices don't have USB-C ports, they can be simulated
with the following commands:
  $ adb shell dumpsys usb add-port "matrix" dual
  # ?s control whether these can be changed
  $ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
  # Do testing here
  $ adb shell dumpsys usb disconnect-port "matrix"
  $ adb shell dumpsys usb remove-port "matrix"
  $ adb shell dumpsys usb reset
  # Use the help for more info
  $ adb shell dumpsys usb -h

Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
 2015-08-04 09:18:57 -04:00
Prem Kumar
cba797450c am 881207b0: am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev 
* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
  Allow Contact sharing by default while connecting Car Kit.
 2015-08-04 01:33:19 +00:00
Maurice Lam
24628cbfeb am ce08d4d3: am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock 
* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
  [Fingerprint] Help text for backup screen lock
 2015-08-04 01:33:18 +00:00
Prem Kumar
eed361bbaf Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev 2015-08-04 00:41:47 +00:00
Maurice Lam
87fadbe6d9 [Fingerprint] Help text for backup screen lock 
Show a help text saying "Choose your backup screen lock method" when
asking the user for backup screen lock during fingerprint enrollment.

A backup translation is specified, using the source string "Set up your
backup screen lock method".

Bug: 22879473
Change-Id: I9b9348141227103e695d1fc78601745cac0309a7
 2015-08-03 23:12:09 +00:00