Wesley Wang
8bc189e31d
Merge "Update app usage page active time column" into sc-dev am: 386d4ba8a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233627
Change-Id: I3db18a28e7a6b949d4e633b5575c42962e60e1ca
2021-04-20 12:33:29 +00:00
Wesley Wang
386d4ba8a9
Merge "Update app usage page active time column" into sc-dev
2021-04-20 11:58:55 +00:00
Jason Hsu
d9ead9bdc2
Merge "Update accessibility icons for S and using adaptive background" into sc-dev am: 8caa677bc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233633
Change-Id: I3d9005ce1a00f403dc23b3d29490a9e302c0aa05
2021-04-20 08:35:08 +00:00
Jason Hsu
8caa677bc2
Merge "Update accessibility icons for S and using adaptive background" into sc-dev
2021-04-20 08:09:42 +00:00
Jeremy Goldman
b17220f064
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: Ia5abc01326c48babd8a328ee2b9dc2eaa0ed155b
2021-04-20 06:57:20 +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
Wesley.CW Wang
f1966e9d0b
Update app usage page active time column
...
Screenshot: https://screenshot.googleplex.com/5DYcV9fFTiatepi.png
Bug: 178197718
Test: make SettingsRoboTests
Change-Id: If0427a4ed634a453ac49b35bd8082b8790ca7402
2021-04-20 13:49:57 +08: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
b4ac9f34ba
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: I789c01add695da38406d2bfc8cd6a260b7c98605
2021-04-20 05:25:38 +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
aeb03a3246
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: Id51b7e30b1e1351749afe018df8740a035bc4a25
2021-04-20 05:14:09 +00:00
jasonwshsu
cad5436bbe
Update accessibility icons for S and using adaptive background
...
* Follow android guideline to use adaptive icon for launcher services/features
* Update color-check-baseline.xml
* Update assets list: text and display, extra dim, dark theme,
magnification, system controls, vibration and haptics, tap assistance,
live caption, caption preferences, real time text, audio adjustment,
hearing aids, font size, display size, bold text, color correction, color
inversion
Bug: 174540160
Bug: 183501919
Test: manual test
Change-Id: I600d64f97d3a4651ebafb9016a6c8bff9bada0a0
2021-04-20 05:11:28 +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
a56a887c79
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: Ie441e73852fbafc442e8e12e23902347d9fcfc48
2021-04-20 03:33:52 +00:00
TreeHugger Robot
c721104a56
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: Ia609f7f36454374602131908b6828b55ae4ab8fb
2021-04-20 03:33:46 +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
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
b4f2a45dfa
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: I4d8d5ed7b6f344d987feb701c327e496cf8ccedf
2021-04-20 02:42:15 +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
acefb6108e
[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: If218e43e5bd179e364d958e978608016ec339c70
2021-04-19 23:40:43 +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
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
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
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
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
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