Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,698 Commits 1 Branch 0 Tags
57c4ddcb15b157a0f29e92624b7bfd1348a5e81c
Commit Graph

3038 Commits

Author SHA1 Message Date
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
Jorim Jaggi
f8bb7c89d8 am 222aeaf3: am 18dea40e: am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev 
* commit '222aeaf301061bf0cc24b3400dadec1e1791ec80':
  Adjustments for find sensor screen
 2015-07-29 23:09:40 +00: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
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
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
aa587b39b6 Adjustments for find sensor screen 
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
 2015-07-28 23:58:56 +00:00
Jorim Jaggi
0378c2e55d am 91f4d549: am f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 
* commit '91f4d5490d0f9aa86015c565250b2f8d9e2d608b':
  Adjust enrollment UI for sw400 devices
 2015-07-28 21:38:17 +00:00
Jorim Jaggi
74af384cae Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 2015-07-28 19:50:47 +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
Selim Cinek
b812ead9a8 am e8619653: am c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 
* commit 'e861965343c8fe4a25d874d1198fef5f7764148c':
  Adapted a string in the fingerprint enrollment flow
 2015-07-28 03:47:17 +00: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
936734f5c1 am 74129926: am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
  Update battery optimization strings
 2015-07-27 19:01:39 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings 
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
 2015-07-27 12:29:25 -04:00
Adrian Roos
81ce2ea882 am 2f00f2c8: am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec 
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
  Update FRP warning to spec
 2015-07-25 16:54:16 +00:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec 
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
 2015-07-24 15:09:34 -07:00
Selim Cinek
b48e9fdcab Adapted a string in the fingerprint enrollment flow 
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
 2015-07-23 15:29:01 -07:00
Maurice Lam
760c4f1b5d [Fingerprint] Add strings for fingerprint during SUW 
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
 2015-07-22 11:21:31 -07:00
Billy Lau
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev 
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
 2015-07-21 18:51:31 +00:00
Billy Lau
bb3aa2632a Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)... 
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings.xml:
Increased the CHAR limits for some strings due to requests from translators.

Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
 2015-07-21 17:44:49 +01:00
Daichi Hirono
35197218fc Merge "Turn the eject menu into a button." 2015-07-21 06:14:37 +00:00
Maurice Lam
fed7de4546 am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
  [ScreenLock] Change title of encryption interstitial
 2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683 am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev 
* commit '6e512e0815c8678621077008498f18e73402ecc3':
  [Fingerprint] Change message in encryption
 2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
  [ScreenLock] Change title for RedactionInterstitial
 2015-07-21 01:37:06 +00:00
Maurice Lam
d85fafce30 Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev 2015-07-21 00:38:39 +00:00
Maurice Lam
d10026cbfd Merge "[Fingerprint] Change message in encryption" into mnc-dev 2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831 Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev 2015-07-21 00:22:03 +00:00
Maurice Lam
5cceb312fd [ScreenLock] Change title for RedactionInterstitial 
Change the title for RedactionInterstital to "Notifications".

Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
 2015-07-20 23:42:52 +00:00
Maurice Lam
15546c0b9d [ScreenLock] Change title of encryption interstitial 
Change the title of EncryptionInterstitial to "Secure start-up".

Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
 2015-07-20 15:23:41 -07:00
Maurice Lam
c0e7879684 [Fingerprint] Change message in encryption 
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.

Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
 2015-07-20 21:52:12 +00:00