Commit Graph

82753 Commits

Author SHA1 Message Date
Hugh Chen
368ba20c95 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -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: I3967969e09f69542cc461ca818d5024e7fe33f48
2021-06-28 06:37:08 +00:00
Hugh Chen
a539c36421 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
Hugh Chen
dbcebc42bf [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +00:00
Hugh Chen
ff719d5bd8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00
Hugh Chen
0cfe42b287 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ibf35314504458240ec753c062f284225508701bd
2021-06-28 06:19:08 +00:00
Hugh Chen
367921a80d [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
2021-06-28 06:19:04 +00:00
Hugh Chen
499cfe303f [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
2021-06-28 06:18:59 +00:00
Hugh Chen
87426af532 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I8d89f0ac05df88cd680a15e8c64c2133b1619e53
2021-06-28 06:18:56 +00:00
Hugh Chen
bc51750bf1 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I47d3d52d1f11879e049bef336d0dde464b5de048
2021-06-28 06:18:50 +00:00
Hugh Chen
9eef0e089d [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I4ce2d29b73bd2db7ba3cb74cad46515eba64e425
2021-06-28 06:18:45 +00:00
Hugh Chen
bee2daea18 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I28b33a8286af88bc1b494cd325cb946e9ccca554
2021-06-28 06:15:26 +00:00
Hugh Chen
76545f383c [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours
am skip reason: skipped by user hughchen

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: Ieec3c3403fe68257bbd3c04ec2395af202e2b28d
2021-06-28 06:15:18 +00:00
Hugh Chen
c551f39977 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -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: Ifef9d53b072a081c2c78437e4bc77e511024092a
2021-06-28 06:14:41 +00:00
Hugh Chen
9316df9560 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -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: Ic3ca73d1126a07c955e10b7871b9ccec0038b60d
2021-06-28 06:14:38 +00:00
Hugh Chen
3fcb9c9811 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I265d8d2c13c97463ba2d9449e68925199b90be3c
2021-06-28 06:14:35 +00:00
Hugh Chen
9f4308daa2 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24
2021-06-28 06:14:30 +00:00
Hugh Chen
505cc44596 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ic4237a93471f2064896492eb607447620c0fc21a
2021-06-28 06:07:26 +00:00
Hugh Chen
1fe494db11 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: If38bb4a7880b0771648410c2dc11285e07008b34
2021-06-28 06:07:20 +00:00
Hugh Chen
a11ed686d4 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I66e622edb04b797035548be5e8e5bff1585d44a1
2021-06-28 06:07:14 +00:00
Hugh Chen
91d5f08e39 RESTRICT AUTOMERGE Update string am: 9356205dfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I39be0753d272bcde0b4ade53ae3afc74a67155f8
2021-06-28 06:07:09 +00:00
TreeHugger Robot
85524a7276 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916

Change-Id: Id5025c35217126e88af7d100fff6960699d3ae94
2021-06-28 06:06:38 +00:00
TreeHugger Robot
1c6594bcd4 [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136

Change-Id: I675c537b664572cdd7a097aa0516dfd6fce6055b
2021-06-28 06:06:32 +00:00
Hugh Chen
d351303e36 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I311472b1f9d27cc4a7da875150741f0eb51e573f
2021-06-28 06:06:01 +00:00
Hugh Chen
3f493a3078 RESTRICT AUTOMERGE Update string am: 7ce80425ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I9c8fabb01ea2cf69b2714523b361f50a5a597561
2021-06-28 06:05:58 +00:00
TreeHugger Robot
9c105d911a Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev 2021-06-28 05:55:46 +00:00
TreeHugger Robot
b2b280a67a Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev 2021-06-28 05:55:26 +00:00
Bonian Chen
f4a80fdfa3 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev
* changes:
  Revert "[Settings] Fix build breakage"
  Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
2021-06-28 05:28:07 +00:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage"
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
2021-06-28 05:23:33 +00:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8 Merge "[Settings] Fix build breakage" into sc-dev 2021-06-28 03:59:43 +00:00
Arc Wang
3625cf50aa Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev 2021-06-28 03:43:59 +00:00
TreeHugger Robot
0bea498ae1 Merge "Fix switch behavior with switch access" into sc-dev 2021-06-28 03:01:29 +00:00
Arc Wang
465560d388 Shows ripple effect inside CardPreference's rounded rectangle
contextual_card_background is a drawable which shows ripple.
Sets contextual_card_background as the foreground of
MaterialCardView.

Bug: 191617809
Test: manual visual
Change-Id: I09ee886fe56e443626042682381560ed0f32d51d
2021-06-27 15:59:18 +00:00
TreeHugger Robot
1060b2f926 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 05:16:50 +00:00
TreeHugger Robot
e78163f7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834

Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032

Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
2021-06-26 05:15:33 +00:00
TreeHugger Robot
28dbcbf459 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-26 05:13:39 +00:00
TreeHugger Robot
ce6e84f830 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837

Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
2021-06-26 05:11:35 +00:00
Bill Yi
28cd196a94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838

Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
2021-06-26 05:11:20 +00:00
TreeHugger Robot
b92673984b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-26 05:01:37 +00:00
TreeHugger Robot
edea8a6799 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-26 04:58:47 +00:00
Bill Yi
3d56d7be5c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1be53c98eb342d9fa588e3c953bf34cd9d12ba75
2021-06-26 03:33:56 +00:00
Bill Yi
9f28edb782 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
2021-06-26 03:23:44 +00:00
Bill Yi
130e0ec1ba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9e83b41c6c7836d1189d68db61d17f4261f4f920
2021-06-26 03:19:15 +00:00
Bill Yi
4f307c462f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If1e176b4aecb4b1db470d97eb30501c75f893dfe
2021-06-26 03:15:46 +00:00
Bill Yi
aa649a6fe5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
2021-06-26 03:07:35 +00:00
Bill Yi
ef757416ab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
2021-06-26 03:02:32 +00:00