TreeHugger Robot
edd48c8316
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 39df8b0bb9 -s ours am: 94b4e5db48 -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: Idb39af963aef41710e7e77b9cd29dc0eb7d22570
2021-06-28 20:12:37 +00:00
TreeHugger Robot
a813eb5ed8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: 4c3d565029 -s ours am: 97b9f5e7df -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: I6002a820866d4057d8e48d1202472dfa62c711bf
2021-06-28 20:11:57 +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
1288d0a69f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours am: 15a7f5ed3d -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: I6603de8e724a4cf8a9dee96cd53a23c836720a0c
2021-06-28 19:53:05 +00:00
TreeHugger Robot
b2f5f78e0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours am: e956631e69 -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: Icfe3dd3d9849ce13e6e9decc99da3c458654318f
2021-06-28 19:52:44 +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
15a7f5ed3d
[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: If45ba7e69d33b06a8875df3923dd7e35d0a551b0
2021-06-28 19:28:13 +00:00
TreeHugger Robot
e956631e69
[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: I6fa2a9def0ef55b8de3e2a01004b6b604387e7d4
2021-06-28 19:28:08 +00: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
80568a1bb7
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18 am: 4b5d1e78d5 am: 2e6c722b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Icace5fa96c68c1a9dc8e4a3c45758c2674cea8b5
2021-06-28 18:15:31 +00:00
Mill Chen
fa1d6035e0
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18 am: 4dcaae38c6 am: 6ce52ab60b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Idbdda376ffaf3205cf49eaac91c805faec6bf04b
2021-06-28 18:14:53 +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
Mill Chen
409d2ed788
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18 am: a702d0865e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: I3b183ab2a11d09e3c27cabfc552591b7652d56ad
2021-06-28 18:06:21 +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
Mill Chen
a702d0865e
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: Ide9facf2afd38e2ae411f94dac9cc710634fa2f7
2021-06-28 17:50:32 +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
6a3c5698ca
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 5f125d8284 am: b578288050
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: If10a15c6e243b0d7e3ad3f7f0116f83c89393423
2021-06-28 13:21:35 +00:00
Yanting Yang
2097537645
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 93b716660e am: b43ae18803
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: Ica06fac92e1ae37e30cf33b9ac40bc64fbcc491c
2021-06-28 13:21:27 +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
9830f4452a
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475 am: 1267eb0550
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: I1379efd86d8b75f0a7bfab2499fb9fd4c9886487
2021-06-28 13:11:52 +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
1267eb0550
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: I68b3a1c7fe39c285fddaf54c31851349b94c108c
2021-06-28 13:02:47 +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
d8e290bf98
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6be744ee95 am: fa9481c92b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: I6f2d50db8799bb22d27d3b8443569526f03a4c6d
2021-06-28 10:36:52 +00:00
Bonian Chen
e1f374594e
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 26af8823ef am: ffb5c7f2fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: Ib28c3628584bbbd7ee4a87735b6e9081cadb75b4
2021-06-28 10:36:20 +00: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
c353a6b327
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d am: 6123d844d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: Ie7aba1f1b8f232817083057e919814216f94a969
2021-06-28 10:23:45 +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
6123d844d5
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: Ic665f9bc531d79e8349292ccebc3c6f178e87668
2021-06-28 10:15:22 +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
b1f467f445
[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: bca964069b -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: Id6ba5d9a8d31021d7bdf7e043289d2bf4fb346a4
2021-06-28 07:52:06 +00:00
Hugh Chen
e957900715
[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: 495b66de91 -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: I7027389c94e1e03202deddbf9eb0eb271860d31d
2021-06-28 07:52:00 +00:00
Hugh Chen
c7eab66630
[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: 8ff6323394 -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: Ief23cb6007dc8243a8f92ee8994cd84d3626c133
2021-06-28 07:51:55 +00:00
Hugh Chen
aa1b04462a
[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: 999cccd462 -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: I2b303f4454682a71f2640e5579d4425718e9c332
2021-06-28 07:51:48 +00:00
Hugh Chen
f219828cab
[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: c4a519897f -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: I0f6243ec76699c479784c8fb0948c5274614f091
2021-06-28 07:51:41 +00:00
Hugh Chen
9b4119455b
[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: b49d68d7ce -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: I4aec401ef3c4e915dce6c3580d8b87f813270dbc
2021-06-28 07:51:35 +00:00
Hugh Chen
e4255f4d29
[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: 474c9fd1da -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: If5c613e81cd7dff7236d53acfcf7c3b1d43b8191
2021-06-28 07:51:28 +00:00
