Curtis Belmonte
26f5a75259
Adjust layout of the face education Lottie animation am: d8c142b44a am: 0d0a045bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425
Change-Id: I30c39524f0cf8ddaeef6d41c5f97f78dc20adae7
2021-06-29 00:07:41 +00:00
Curtis Belmonte
0d0a045bad
Adjust layout of the face education Lottie animation am: d8c142b44a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425
Change-Id: Ieaa753a52bfae3b43938f72a462b4a11316d7c8e
2021-06-28 23:51:03 +00:00
Curtis Belmonte
d8c142b44a
Adjust layout of the face education Lottie animation
...
Updates the size and position of the face enroll education Lottie
animation to support the latest version.
Test: Manual
Bug: 181373277
Change-Id: Ieccd3fa839f3ef329ed732a8b8623baf236c31ad
2021-06-28 15:37:34 -07:00
Erik Wolsheimer
6a2c48a77f
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 8434eed3e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027
Change-Id: I62adfc14f46ccfbc5373aaecab1bacdf196d0e38
2021-06-28 21:03:57 +00:00
Erik Wolsheimer
93cc3ea981
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab am: 7fa9100f4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027
Change-Id: Ic831cade470554be06698da2b7de3a0466b12d81
2021-06-28 21:03:37 +00:00
Erik Wolsheimer
7fa9100f4a
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027
Change-Id: I9e78359c2613542dbf3a025c2e1337c214cd261e
2021-06-28 20:52:41 +00:00
Erik Wolsheimer
8434eed3e3
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027
Change-Id: I27d13c5e9ceb5440b3cb4a5e3a5a960bd757c5ae
2021-06-28 20:51:47 +00:00
Erik Wolsheimer
89af43a4ab
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev
2021-06-28 20:39:21 +00:00
TreeHugger Robot
e86e2ce070
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 392e4a67ce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443
Change-Id: I305da6bad506b85f20eaaa9a606d45d71aadf7d7
2021-06-28 19:55:58 +00:00
TreeHugger Robot
78559d2b31
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 93cf2766da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261
Change-Id: Ieb67f9d3c25ee8ca4f43f17af265cafad91143bd
2021-06-28 19:55:52 +00:00
TreeHugger Robot
94b4e5db48
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 39df8b0bb9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443
Change-Id: I7a55b90980797e6709467a6a39e7c9282fe1761d
2021-06-28 19:54:55 +00:00
TreeHugger Robot
97b9f5e7df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 4c3d565029 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261
Change-Id: Ic0b1777d1014f54e1afa4e986cd74905295327d1
2021-06-28 19:54:36 +00:00
TreeHugger Robot
39df8b0bb9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443
Change-Id: Iaa37c939eaff86408e7256ecbc6bc1ca1b4125eb
2021-06-28 19:29:09 +00:00
TreeHugger Robot
4c3d565029
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261
Change-Id: I40ea65402827869e490499086ee2ee6836a5a3f8
2021-06-28 19:28:55 +00:00
TreeHugger Robot
392e4a67ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443
Change-Id: I4c9f99b331952bed4e68e84f76bbc17c9ae01e2c
2021-06-28 19:28:19 +00:00
TreeHugger Robot
93cf2766da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261
Change-Id: I7e03b1d91d2124e50751b4757530fdbc4bbfb5ae
2021-06-28 19:28:04 +00:00
Erik Wolsheimer
13564b83dd
Do not refer to 'default' in default_print_service_main_switch_title
...
Bug: 192270303
Test: Manual
Change-Id: I9fd64f321ca259249b55e17b0ea8fff5ff6fe27f
2021-06-28 12:24:01 -07:00
TreeHugger Robot
f7c714547f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-28 19:20:17 +00:00
TreeHugger Robot
f91bc70bb6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-28 19:17:48 +00:00
Mill Chen
2e6c722b5f
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18 am: 4b5d1e78d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Icaecab1a6848a4d6e7595b5f60190dd7023bbb91
2021-06-28 18:07:17 +00:00
Mill Chen
6ce52ab60b
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18 am: 4dcaae38c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Ic06f3621670c95f31eec115f98abbf234b7bfaa6
2021-06-28 18:06:33 +00:00
Bill Yi
1d5f64b1e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ed7b2ca9c085acb83d74f01fd82d1de4d5f89ac
2021-06-28 17:52:23 +00:00
Mill Chen
4dcaae38c6
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: I00c986d6951cdb6177c0638d1f4fab5477de6660
2021-06-28 17:52:08 +00:00
Mill Chen
4b5d1e78d5
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Ie2fa17748dab18f8659acf4621e15845c15fb3a6
2021-06-28 17:50:50 +00:00
Bill Yi
1b154d8247
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If00a7fee9c649efa3c49973c7f8465b94bb24299
2021-06-28 17:48:37 +00:00
Mill Chen
968151aa18
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev
2021-06-28 17:34:01 +00:00
Yanting Yang
b578288050
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 5f125d8284
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: I64924b77329f73f7b0474d12318608ed1756a2d8
2021-06-28 13:12:35 +00:00
Yanting Yang
b43ae18803
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 93b716660e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: I8e95fe4e5faca892ef578067c434ed75b01881bc
2021-06-28 13:12:12 +00:00
Yanting Yang
93b716660e
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: Ia8428ecdc0f9c5ef0f3130b58ab9a099c3033146
2021-06-28 13:03:30 +00:00
Yanting Yang
5f125d8284
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: I068ec6d73a402db50f4a292fd76d8943ca8ea415
2021-06-28 13:02:41 +00:00
Yanting Yang
ca0415d475
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev
2021-06-28 12:54:44 +00:00
Mill Chen
139fa375cd
Add line spacing multiplier for CollapsingToolbarLayout
...
Since there is a problem with a small line spacing between multiline
title of collapsing toolbar in a few locales, that caused the title is
overlapping with each other. Enlarging the line spacing by using
lineSpacingMultiplier to fix it.
Fix: 183223866
Test: visual verified
1) Change to MY locale
2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms &
other interruptions
3) Observe the title and check if it is overlapping with each other
Change-Id: I87f0af5151a6367bc623ac07b15e04c39b51c6ca
2021-06-28 18:39:20 +08:00
Bonian Chen
fa9481c92b
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6be744ee95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: I2ceba6b0d544e23b9874fe69a0813aa20205e915
2021-06-28 10:24:22 +00:00
Bonian Chen
ffb5c7f2fe
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 26af8823ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: I2315933474450633b5639f992935a071f5561267
2021-06-28 10:24:11 +00:00
Bonian Chen
26af8823ef
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: I988673df4227bfae943eea3df6b9de49a5e28364
2021-06-28 10:15:39 +00:00
Bonian Chen
6be744ee95
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: Iec3c149b6caeb872c952d833083a3570f9ebb6f7
2021-06-28 10:14:32 +00:00
Bonian Chen
a3f28b034d
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev
2021-06-28 10:06:21 +00:00
Bonian Chen
d9bf670725
Revert "[Settings] Code Refactor - ActiveSubscip..."
...
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).
It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).
Reason for revert: Try to submit all of the modifications within single submit as a workaround.
Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
2021-06-28 09:32:54 +00:00
Hugh Chen
bca964069b
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: c52b6bc4bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I5b024d6b80686f7bf3a810d56d9e3770fb44bc41
2021-06-28 07:40:44 +00:00
Hugh Chen
495b66de91
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: 9e08ebacf4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I251493467f31e090a3c6045c36712ddf8f13e46e
2021-06-28 07:40:38 +00:00
Hugh Chen
8ff6323394
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: 603f0a5b14 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I32c43f22c00b91633fafa164c9cfb29b157eb743
2021-06-28 07:40:33 +00:00
Hugh Chen
999cccd462
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: 8e922b95f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ied2dd046476816e4038800c3be82888056f65e17
2021-06-28 07:40:28 +00:00
Hugh Chen
c4a519897f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours am: 80d8aaad3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I95c245b0eda14f6dbf5d95b0bab6bd65e391760d
2021-06-28 07:40:21 +00:00
Hugh Chen
b49d68d7ce
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours am: d5b07b03d1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iae9910c8a85ed028079c96d5f09e6291f550087a
2021-06-28 07:40:16 +00:00
Hugh Chen
474c9fd1da
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours am: aff7f97f8c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Id1304f50a7b82d6836cd4911a5e1730e9eb5ad05
2021-06-28 07:40:12 +00:00
Hugh Chen
d3a1edfdab
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours am: a3c7b58697 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I5945a5d193132bdfedc1f0c4c3caf359c154fe59
2021-06-28 07:40:07 +00:00
Hugh Chen
80d8aaad3d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 346b049fb1 -s ours am: 52b13e9795 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I42a6ad11e692ffda53b86b78ca8edb1a9dd3fc29
2021-06-28 07:28:03 +00:00
Hugh Chen
d5b07b03d1
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: c91f8b0991 -s ours am: b17f196c3d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I131999e135f1965bafe5b9aa67f5d737b869491f
2021-06-28 07:27:59 +00:00
Hugh Chen
aff7f97f8c
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours am: 2a2a81dea5 -s ours am: 1e764fb0a6 -s ours am: 5e708fd301 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: If5378005cf7a5445c24748a4aa07e0b539cec352
2021-06-28 07:27:54 +00:00
Hugh Chen
a3c7b58697
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours am: 064bf9dd81 -s ours am: d8ef6bc5af -s ours am: ad3ecbdd0c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ib708132f72b1eff81c443f2163c8783b9a6fd59c
2021-06-28 07:27:50 +00:00