TreeHugger Robot
3b77220873
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-04-19 23:34:20 +00:00
TreeHugger Robot
a6fdf2e38f
[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: Ied5f3df9ad06c5862407726446066998b223a801
2021-04-19 23:29:10 +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
9957057402
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: Ie6393a56f64a921a5858f863f36c28f1d8381860
2021-04-19 23:19:34 +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
ed8dd3c3e5
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: I46f216995c0970d3c69d5bb572b6412f128754ba
2021-04-19 23:09:12 +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
d1644ad398
[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: I088d9254c05e682709fb82bc532396972cfafc63
2021-04-19 22:59:21 +00:00
Bill Yi
2daf41ef7a
[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: I2dd06c22631a5802cdf83d09588ea53f25e27012
2021-04-19 22:59:17 +00:00
TreeHugger Robot
4bb24da723
[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: I1b0ca785b92980aa848cf1b746cea3dbf99550cc
2021-04-19 22:59:12 +00:00
Bill Yi
7e91fa23f8
[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: I22008c36c1b397cc57f49c1dd78769f13e42148c
2021-04-19 22:58:11 +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
df93d5b8f4
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: Ie7be66a59750f414110b6a853017c92bc4da4ab4
2021-04-19 22:02:27 +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
a4380af14e
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: I3defc05d0ab05d2eb819b6aeb9e49d2887ee3025
2021-04-19 16:01:43 +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
Mill Chen
86fd923d6f
Update the style for collapsing toolbar
...
The new version of collapsing toolbar has been updated and it needs
the edge-to-edge configruation to work smoothly. Added the configuration
for Notification history and removed useless styles.
This change is also trying to reuse the layout that is from SettingsLib
and remove the one from Settings.
Bug: 183496853
Test: visual verified
Change-Id: Iecfb96fe5ead91b0421050c3dfc1c1ab456aafff
2021-04-19 20:48:03 +08:00
TreeHugger Robot
e5c789e9f0
Merge "Tweak the layout of top app bar" into sc-dev am: d2bffb94a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199746
Change-Id: Idbb32fb8516dc3211623ac09ce156f42843f01cf
2021-04-19 11:29:27 +00:00
TreeHugger Robot
6c7f674549
Merge "Tweak the layout of top app bar" into sc-dev am: d2bffb94a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14199746
Change-Id: Icf2d0f159ea7bf85521f78e358644809e1d75fde
2021-04-19 11:27:18 +00:00
TreeHugger Robot
d2bffb94a7
Merge "Tweak the layout of top app bar" into sc-dev
2021-04-19 11:02:28 +00:00
Wesley Wang
7872258e40
Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651
Change-Id: I0956332580b02f633d195fafaddbb5bd03d55e67
2021-04-19 10:34:00 +00:00
Wesley Wang
9fbb8e16d0
Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev am: e3cf049039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209651
Change-Id: I742dc967380c74f7c09b3346077217a9f9c49212
2021-04-19 10:32:00 +00:00
Wesley Wang
e3cf049039
Merge changes Iced0fa59,Ic354ac91,I0b4cb6ca,I9c1d3761 into sc-dev
...
* changes:
Add footer to app usage page
Update app usage page with 3 radio button control
Add 3 controller for app usage page radio buttons
Add utils class for app usage operation
2021-04-19 10:15:49 +00:00