Commit Graph

81709 Commits

Author SHA1 Message Date
TreeHugger Robot
2291874e56 Merge "Hide non-system overlay window on AllowBindAppWidgetActivity" into sc-dev am: c066952437
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233629

Change-Id: I508555714a4e2f505f8f9b94bc6a5eb7eb72306d
2021-04-20 05:33:38 +00:00
TreeHugger Robot
c066952437 Merge "Hide non-system overlay window on AllowBindAppWidgetActivity" into sc-dev 2021-04-20 05:22:13 +00:00
Tiffany Nguyen
4c8d27d798 Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: 560234a88a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193839

Change-Id: If41dc564d970f52f7547dcfa4d9a22a3e2c6fe77
2021-04-20 05:11:44 +00:00
Tiffany Nguyen
560234a88a Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev 2021-04-20 04:44:44 +00:00
Treehugger Robot
fe4bcbb657 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005 am: 7609a76fe7 am: 818c5396ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: Ie63b612e8024d487f7911cc439ada93b50acd076
2021-04-20 03:43:59 +00:00
Treehugger Robot
818c5396ce Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005 am: 7609a76fe7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: I1c35d4082fe02fba39bb812257b2c5ad5859c31e
2021-04-20 03:33:39 +00:00
TreeHugger Robot
ef12a2ba72 Merge "Only show single line title on list preference" into sc-dev am: 82bf85944f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233626

Change-Id: Ia8e23f8eefdcedb51402b3ca7a16961b44948348
2021-04-20 03:32:46 +00:00
Treehugger Robot
7609a76fe7 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6 am: ba40979005
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: If59c31a9df0fc8426fa48310aa0eec3157d6a249
2021-04-20 03:18:27 +00:00
TreeHugger Robot
82bf85944f Merge "Only show single line title on list preference" into sc-dev 2021-04-20 03:14:44 +00:00
Treehugger Robot
ba40979005 Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685

Change-Id: I0a31341d2018503a3e8d8bd0c4cd9f0d7637b5d3
2021-04-20 02:53:35 +00:00
Chloris Kuo
504aebdbe3 Merge "NAS settings change" into sc-dev am: 7e9fe7b5c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14232928

Change-Id: If821e0cd34af2e85eb4fea7e161f761b1acde4d5
2021-04-20 02:40:17 +00:00
Treehugger Robot
a1cf8135e6 Merge "Update OWNER file for TTS subfolder" 2021-04-20 02:19:53 +00:00
Chloris Kuo
7e9fe7b5c5 Merge "NAS settings change" into sc-dev 2021-04-20 02:03:27 +00:00
Sunny Shao
55d164784b Hide non-system overlay window on AllowBindAppWidgetActivity
Bug: 184676316
Test: manual test using BindAppWidget-Overlay-poc.apk
Change-Id: I234b5ac26c8f4fd80462b7e9c311d8feca05845f
2021-04-20 09:31:06 +08:00
TreeHugger Robot
01313db4b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3b77220873 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238553

Change-Id: I31a7df9543a587f5050baa4889351b652795bc25
2021-04-19 23:47:32 +00:00
TreeHugger Robot
07cbf2686b Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-19 23:40:32 +00:00
TreeHugger Robot
3b77220873 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-19 23:34:20 +00:00
TreeHugger Robot
fbc8f06044 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cee4d38c27 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238551

Change-Id: I50c4ab94c50bdadd1c67841413e1aaabc9b72356
2021-04-19 23:27:35 +00:00
TreeHugger Robot
957002778b Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev am: 00f29b707e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14217106

Change-Id: Iac32b77681df8595026281d408c49fb67a7e391c
2021-04-19 23:27:25 +00:00
Kevin Chyn
6f02a55125 Merge "Do not scan for fingerprint when rename dialog is showing" into sc-dev am: 704d86baca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14236010

Change-Id: I414a7ca9d08f6467a44f8a2244cc431c596d4ee8
2021-04-19 23:27:11 +00:00
TreeHugger Robot
cee4d38c27 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-19 23:26:29 +00:00
TreeHugger Robot
00f29b707e Merge "Remove multi-biometric interstitial screen in SUW" into sc-dev 2021-04-19 23:15:38 +00:00
Kevin Chyn
704d86baca Merge "Do not scan for fingerprint when rename dialog is showing" into sc-dev 2021-04-19 23:04:09 +00:00
TreeHugger Robot
c119a836b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours am: 4c69b3e30e -s ours am: bcf4d4fce2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979

Change-Id: I820a44271644040f222ae265926f95cfff36ce1b
2021-04-19 22:57:14 +00:00
Bill Yi
f115dab6d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours am: debe299d81 -s ours am: eae1ad93f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550

Change-Id: Ie007dcc087ddb27dcc509e59ae8848b8c53e7d4c
2021-04-19 22:57:09 +00:00
TreeHugger Robot
6670e5b72e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1da5e095f0 -s ours am: 64e0a1d447 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238546

Change-Id: I422ce2d1de5d5e375157416d7839fe6010aa21db
2021-04-19 22:57:02 +00:00
Bill Yi
8a06b12b05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours am: 17635a6d9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238545

Change-Id: I65e3cfe16a0b79de3cdfc99bf716b6d3d21223cb
2021-04-19 22:56:35 +00:00
TreeHugger Robot
bcf4d4fce2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours am: 4c69b3e30e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979

Change-Id: If26bec1e8faa26e5ccad76f6632d741dd6ddb62c
2021-04-19 22:34:59 +00:00
Bill Yi
eae1ad93f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours am: debe299d81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550

Change-Id: I9a669ee30db5acbdfa6d90e971d7ae4ba51ca1b7
2021-04-19 22:34:54 +00:00
TreeHugger Robot
64e0a1d447 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 1da5e095f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238546

Change-Id: I5059674c6aacf849413df3e40cc23684e7af4267
2021-04-19 22:34:44 +00:00
Bill Yi
17635a6d9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926d7148f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238545

Change-Id: I65e1498d9d8f8b3dbc827a15be74950f4b7a536c
2021-04-19 22:33:59 +00:00
TreeHugger Robot
4c69b3e30e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979

Change-Id: I96bb90ccfe25cfd6f56020a54020ad8755380b6b
2021-04-19 22:18:52 +00:00
TreeHugger Robot
1da5e095f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-19 22:17:45 +00:00
TreeHugger Robot
617960adc5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-19 22:17:06 +00:00
TreeHugger Robot
6a691cbc1a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 22:11:59 +00:00
Bill Yi
debe299d81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550

Change-Id: Ideb6b39714e86e01bfc84aecafc99e89d5741dac
2021-04-19 22:08:53 +00:00
Kevin Chyn
9df1b3d2f6 Actually use new string in fingerprint settings am: 83b061d3da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238002

Change-Id: Icb8da213baf3584fbaa5f99b65903f3a1eae1652
2021-04-19 22:01:25 +00:00
Curtis Belmonte
5f1d13e3b0 Remove multi-biometric interstitial screen in SUW
On devices with multiple biometric sensors, this removes the
interstitial screen in Setup Wizard that let the user choose whether to
enroll face, fingerprint, or both. Instead, such devices will always
show face enrollment followed by fingerprint, with the option to skip
either or both.

Test: Manually tested all enroll/skip combinations in SUW

Fixes: 183720580
Change-Id: I7f045579f732196bde28dd96e9443e4bb4c906ae
2021-04-19 14:24:47 -07:00
Kevin Chyn
ee8fc8d587 Do not scan for fingerprint when rename dialog is showing
Fixes: 185670313
Test: manual
Change-Id: If153806d25c5397f1699d049a10c5bccaf87e413
2021-04-19 14:20:56 -07:00
Bill Yi
0c815374e6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If3d707ca4c2cda14502f47baf5ff2f0e038a9dd2
2021-04-19 21:12:51 +00:00
Bill Yi
b97c595a50 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2b77942679062e4e8eec6fde8298b737e37574b5
2021-04-19 21:08:36 +00:00
Bill Yi
c50c6cf64d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7a0db16b0ef7e5a4c110a24a2eb2fad6461c31bc
2021-04-19 21:04:52 +00:00
Bill Yi
403e4244c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3ec46a3938ac5230e56e2a75ffe53500db2e3e39
2021-04-19 21:03:08 +00:00
Bill Yi
4edd6f1d2e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0eb5c765212e06835518338f632653cd97764b16
2021-04-19 20:59:50 +00:00
Bill Yi
e7ff773ec9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I63b71ebf8f57a8effa4345bb1b00dbf35c2b1b3e
2021-04-19 20:56:11 +00:00
Bill Yi
cfa683bcea Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I92f69b8b0d4437bcc4c7092b0f432c6dd2041d30
2021-04-19 20:53:07 +00:00
Bill Yi
926d7148f5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifb9078b852b716a55695c56d410c135760c90e8e
2021-04-19 20:49:31 +00:00
Kevin Chyn
83b061d3da Actually use new string in fingerprint settings
Fixes: 185805485
Test: Manually inspect
Change-Id: I9a92d4198e3482d7f08d033f8d1242a28a39ef4a
2021-04-19 13:05:35 -07:00
ykhung
b53ed32ed5 Refine startBatteryDetailPage method to support history data am: 4752ea17b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14231927

Change-Id: I3a64bc66cd48af0b57e4b6e2752cefb08c72969f
2021-04-19 16:01:47 +00:00
ykhung
4752ea17b9 Refine startBatteryDetailPage method to support history data
Bug: 177406865
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iee3b6b353c4f92bdad37fac55adad58b4f205bf6
2021-04-19 14:06:55 +00:00