Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,973 Commits 1 Branch 0 Tags
32f1fe5b8a9053cf467ae9b304f5e693194fd9bc
Commit Graph

2485 Commits

Author SHA1 Message Date
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
Sanket Padawe
a7a4a5a2cf Allow Contact sharing by default while connecting Car Kit. 
Bug: 22556703
Change-Id: I335115bd1f6a2b043fb2ac8eeb1f9512b542e030
 2015-07-31 17:22:45 -07:00
Maurice Lam
0ae9cfcff8 am 824bcec9: am 0d1f08cb: am e2d4c5e8: am 09840984: am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev 
* commit '824bcec98d86a406bb90ca031e359d392f9f6ba9':
  [Fingerprint] Advertise wake & unlock during SUW
 2015-07-31 01:15:16 +00:00
Maurice Lam
997bcaa7d8 Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev 2015-07-31 00:43:58 +00:00
Maurice Lam
5656314aca [Fingerprint] Advertise wake & unlock during SUW 
Adds a string to advertise to the user that wake & unlock is
available on all fingerprint devices.

Bug: 22644642
Change-Id: I9e44174c6ab088a06f95ae5c377c8ccec13a4257
 2015-07-30 17:02:26 -07:00
Jorim Jaggi
2181b3d310 am ba3c4ba2: am 02a2be35: am d9eae869: am 80d5c931: am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev 
* commit 'ba3c4ba235a1f13e804faed7911c3033997d4ad2':
  Add dialog to confirm last fingerprint removal
 2015-07-30 20:50:04 +00:00
Jorim Jaggi
92f9bdc6ec Merge "Add dialog to confirm last fingerprint removal" into mnc-dev 2015-07-30 20:16:08 +00:00
Jorim Jaggi
12ee807c1f Add dialog to confirm last fingerprint removal 
Bug: 22847296
Change-Id: Ib4984d8db0c9abc00442026360bd5617515225aa
 2015-07-30 12:42:08 -07:00
Jason Monk
92ec7b4e23 am d7c4c89f: am e05b10fd: am e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount 
* commit 'd7c4c89f5efb39ce8bf9f2f38ff2b7905508b3f2':
  Extend char limit by small amount
 2015-07-30 16:59:56 +00:00
Jason Monk
19128bd167 Extend char limit by small amount 
Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23
 2015-07-30 11:05:09 -04:00
Julia Reynolds
7b37a563ce am 89594f52: am 61bc6b72: am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev 
* commit '89594f520ad0b59dd58ea67cd788d6ee63485fdb':
  Change assist app warning message text
 2015-07-29 22:02:33 +00:00
Julia Reynolds
5bdf80c868 Change assist app warning message text 
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
 2015-07-29 13:02:09 -04:00
Julia Reynolds
77f4d053d6 am 9062cdba: am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit '9062cdba945cbb493df54b5a7ab61a514283d0e0':
  Bump string char limit.
 2015-07-29 13:55:08 +00:00
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
f299787f32 am 25f86b0f: am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
  Fix tap & pay strings.
 2015-07-29 11:04:34 +00:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Jorim Jaggi
c19d2be9de am 2f975b53: am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit '2f975b534dd1acd3a2e5414a36e2e25af1586c07':
  Adjust choose assist app string
 2015-07-28 18:47:21 +00:00
Julia Reynolds
5dadca81eb Bump string char limit. 
Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
 2015-07-28 13:39:24 -04:00
Martijn Coenen
b637ba08ad Fix tap & pay strings. 
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
 2015-07-28 16:37:39 +02:00