Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,427 Commits 1 Branch 0 Tags
2ea4986406daead1ffa2cd56f4caae048655abb5
Commit Graph

2960 Commits

Author SHA1 Message Date
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
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
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
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
8500822b8e Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 2015-08-11 23:17:24 +00:00
Maurice Lam
a430ac56b2 am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
  [Fingerprint] Use different ring size for setup
 2015-08-11 22:43:35 +00:00
Maurice Lam
3d9cb92618 Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 2015-08-11 22:35:53 +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
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +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
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
d62aabf10d [Fingerprint] Use different ring size for setup 
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.

Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
 2015-08-07 10:48:48 -07:00
Maurice Lam
311a2d9525 Merge "[Fingerprint] Update string for enrolling" into mnc-dev 2015-08-05 00:38:37 +00:00
Maurice Lam
2a74b86238 am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
  [Fingerprint] Shrink fingerprint progress ring
 2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 2015-08-05 00:09:32 +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
Maurice Lam
42b6ad595b [Fingerprint] Shrink fingerprint progress ring 
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.

Bug: 22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
 2015-08-04 15:06:26 -07:00
Jason Monk
9824c5da1e resolved conflicts for merge of 1adca55f to mnc-dr-dev 
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
 2015-08-04 16:23:32 -04:00
Nick Kralevich
1adca55ffe Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev 2015-08-04 19:45:58 +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
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
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
Nick Kralevich
8a9b03f746 UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER 
In ec323a0849, DISALLOW_USB_FILE_TRANSFER
turned off all USB options except for "Charge Only". This is too
aggressive. MIDI should be available when DISALLOW_USB_FILE_TRANSFER
is set.

Remove mUsbManager.isUsbDataUnlocked(). That data is available
by accessing the sticky broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: Icd8398c4cf43f807acf77923b0b25c18f9a9b0d0
 2015-07-30 16:34:01 -07: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
19128bd167 Extend char limit by small amount 
Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23
 2015-07-30 11:05:09 -04:00
Jorim Jaggi
23ace01340 Merge "Adjustments for find sensor screen" into mnc-dev 2015-07-29 21:58:43 +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
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Jorim Jaggi
aa587b39b6 Adjustments for find sensor screen 
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
 2015-07-28 23:58:56 +00:00
Jorim Jaggi
74af384cae Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 2015-07-28 19:50:47 +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
Jorim Jaggi
730389bd82 Merge "Adjust choose assist app string" into mnc-dev 2015-07-28 00:39:12 +00:00
Jorim Jaggi
9b456e5f9d Adjust enrollment UI for sw400 devices 
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
 2015-07-27 17:31:58 -07:00
Jorim Jaggi
66664bea91 Adjust choose assist app string 
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
 2015-07-27 14:53:48 -07:00
Selim Cinek
95ddf90349 Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 2015-07-27 20:57:23 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings 
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
 2015-07-27 12:29:25 -04:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec 
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
 2015-07-24 15:09:34 -07:00