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
c8cc41b226
Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295
Change-Id: I760cbb29865295678a5033e58c9412d1ab9af51c
2021-06-28 05:42:20 +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
6fbeadac34
Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803
Change-Id: I78d5afe93092c4ca5f874177e56ad1cc73620384
2021-06-28 04:38:44 +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
f6e9f00332
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410
Change-Id: I6888257ca0fb942c1e388448cb71466000bdabe3
2021-06-28 04:03:14 +00:00
Bonian Chen
f03086e9db
[automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8
-s ours
...
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785
Change-Id: Iea5aafb8e04dfbed3c9d3d132508161c31bbecc1
2021-06-28 04:03:12 +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
d7a57a59d6
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781
Change-Id: I6ce40af99f6494a915040e662c86ad0e93444110
2021-06-28 03:57:13 +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
Arc Wang
e8de94a21d
Fix 'No Apps' UI issues of ManageApplications
...
Fixes below UI issues
- "No Apps" may not show in fragments of profile tab.
Fix it by using ConstraintLayout to specify alignments
of each view and removing extra padding.
-- "No Apps" may flicker by moving position.
The flicker is from unnecessary visibility changes.
This change integrates empty view visibility
control in LoadingViewController to simplify code
and avoid unnecessary visibility changes.
Bug: 189390795
Bug: 183398721
Test: atest com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
Manual visual, observe UI
Settings -> Storage -> Games
Settings -> Notifications -> App Settings
Settings > Apps > Special app access > Media management apps
Change-Id: I634209c6f8466e2adae703226902190bbdf470b9
2021-06-28 11:33:10 +08:00
TreeHugger Robot
194c2a8c0a
Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042
Change-Id: I77608d1b291e07ed8034450b89bb08bf2328d4be
2021-06-28 03:24:15 +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
d89e093b0a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115842
Change-Id: I1926e256a90e2cbf545b0d226759765a026744c5
2021-06-26 05:18:48 +00:00
TreeHugger Robot
6de3887716
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours am: e78163f7c7
-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: I3bab0563590d52f04f1331d1140e3cdc64c7a3af
2021-06-26 05:18:44 +00:00
Bill Yi
fbb0783097
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours am: 4621b36198
-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: Idf63a94f20b9ff08dc4f258849445ffe5d422acc
2021-06-26 05:18:38 +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
75075b106e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours am: ce6e84f830
-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: I019ec88ca84edabf398c7ce8f653b5152cc5d461
2021-06-26 05:15:30 +00:00
Bill Yi
752d115af3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours am: 28cd196a94
-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: I260cd61b3cdec9423743033b427a70f4301ddc2e
2021-06-26 05:15:19 +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
TreeHugger Robot
9fa5aba57d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I056e3a2e607750f4431a58bf2f2876ff5aec6028
2021-06-26 05:11:23 +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
7a2b7d7dbd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-26 05:11:09 +00:00
TreeHugger Robot
240df19188
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-06-26 05:02:57 +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
4807ff8a84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8fc0d492b2e23f8c1d01b97b6d551bc818b63873
2021-06-26 03:11:20 +00:00