Jeremy Goldman
061bd0ab7c
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9 am: 032b0a4bf3 am: 8c895001b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: I552fb80bb66439c22eaa7cac4be2536125ef9b3d
2021-04-20 06:55:19 +00:00
Jeremy Goldman
8c895001b8
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9 am: 032b0a4bf3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: I893bf71a8450cd1ca0ecbf7ad78211232d6fa086
2021-04-20 06:34:11 +00:00
Jeremy Goldman
032b0a4bf3
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6 am: e67b576ab9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: I7e906e3982dab72dfed796bc061f37468c2e3f2d
2021-04-20 06:08:30 +00:00
Jeremy Goldman
e67b576ab9
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: Ia0580d6c17e936fe631c0cd1e0d946fa6881a92c
2021-04-20 05:44:54 +00:00
TreeHugger Robot
7cec0ba0a9
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: I6b2517e5892523e0bf2618f31abc8d856a5cdfe3
2021-04-20 05:33:45 +00:00
Jeremy Goldman
162029c5b6
Merge "Check if the SubscriptionsChangeListener has been started before stop"
2021-04-20 05:24:37 +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
8f388e21e8
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: I656a977b761f8ae9b47a5ba6ace974cc87054478
2021-04-20 05:12:15 +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
590ef5abaf
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: I9d1b36e8687738c156eed0c806a1dc9741e51b07
2021-04-20 03:44:30 +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
Jeremy Goldman
660e7164c7
Check if the SubscriptionsChangeListener has been started before stop
...
calling mContext.unregisterReceiver on an unregistered broadcast
receiver will result in an exception. To make the
SubscriptionsChangeListener safe from this kind of error, add a check to
see whether start has been called before implementing stop's
functionality.
Bug: 184662284
Bug: 184521296
Test: atest -c SettingsUnitTests
Change-Id: Ic13911ee7573666f5d42ab4612c025968984ba47
2021-04-20 11:33:17 +08:00
TreeHugger Robot
f9bf55e408
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: I619ccbd6b5c9c2e66cb5eef75c5630e4784eee99
2021-04-20 03:32:42 +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
bb353dc6e6
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: Ibbf719abd448e4b173ffa5bab2bf534898de1f29
2021-04-20 02:40:16 +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
7bee45f5fe
[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: I6e3a5ba3e4d90cbc427452380b03f3954fb31393
2021-04-19 23:38:47 +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
ebf90cafb6
[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: I5776581bed322c3c7c51a184c3f75208cb8645e2
2021-04-19 23:29:22 +00:00
TreeHugger Robot
abd19ade78
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: I6a1db8eb0108606aa02fa2f2314ca346d2df89df
2021-04-19 23:29:13 +00:00
Kevin Chyn
7c6534b743
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: I7ff21c9d45e906d566923f99374736cecafa34b0
2021-04-19 23:28:41 +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
3a6c33341f
[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: I4ed22875d1e7d4d5bcf949e64e822b4b11d8eba5
2021-04-19 22:57:15 +00:00
Bill Yi
d124087929
[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: Ief4d55e8e9fbdd69d8a40a032d3056d138a9ffa4
2021-04-19 22:57:10 +00:00
TreeHugger Robot
f3a4b8e7cc
[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: I24cd5378d20d6b319e168b911d0545afb6456b5a
2021-04-19 22:57:05 +00:00
Bill Yi
6c1238e3ac
[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: I82f918c90da25c58c54d41789d0567ae01cf5f52
2021-04-19 22:56:56 +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
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
1375b86d84
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: I64979e072953f8538eca94c821f736ac561bfa2f
2021-04-19 22:00:34 +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
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
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