Commit Graph

85213 Commits

Author SHA1 Message Date
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
353b231679 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 am: 40a93c2511
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: Ib092d0cd84cb8bd48a92e8fc23f87c43ae3e7124
2021-06-28 05:52:07 +00:00
Bonian Chen
704b69ac35 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 am: 1e035db889
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I1b0deaf438a5bfc60dfbacc9ab3f62aeacdb1e5c
2021-06-28 05:51:48 +00:00
Bonian Chen
1e035db889 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: If8a1949b5cd7e8e47592685a24d7e966d72827a4
2021-06-28 05:43:08 +00:00
Bonian Chen
40a93c2511 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: I01d1c9a907097c944f68829bc0ff9d68eebd1435
2021-06-28 05:42:19 +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
7fdf264b88 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: b664b7f0c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Ia7fdf69b570e6a3d94ae2485a073cb557474f6a1
2021-06-28 04:51:56 +00:00
TreeHugger Robot
f855901e7d Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 3110021f51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I70216fb6ce75fdbab7b770a160d88098bd083271
2021-06-28 04:48:32 +00:00
TreeHugger Robot
b664b7f0c0 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: I9f35f48be860d3513e64d724a98f6e01d7282331
2021-06-28 04:39:32 +00:00
TreeHugger Robot
3110021f51 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: I14c08d87c5895a6962142a226d52f3ed6fbf7b84
2021-06-28 04:37:57 +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
892bd63eba Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: aaea164675
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: Iada0ebadf897e11d8f8cc9b79d8e3c33df3e4020
2021-06-28 04:13:31 +00:00
Bonian Chen
fcb5e44513 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: b45ea80636 -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: Ife5270eb204de173fe31b81a2c78685993c1d169
2021-06-28 04:13:30 +00:00
Arc Wang
e989bd2b39 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 659eb02d2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I03f77f855a49eb02a5e594d10b100616ee230690
2021-06-28 04:13:24 +00:00
Bonian Chen
e0667d76d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I41b520c31b5ffaef539f3873f4b2863cbf907960
2021-06-28 04:13:08 +00:00
Bonian Chen
bf0827680b [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: 8e80d83db5 -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: I046dea0a350b64b41b2798d28f81af85674ff41d
2021-06-28 04:13:07 +00:00
Arc Wang
cc4745e44c Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 14920afb08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I927766434199149ea622f98ecb5471ef7dc943a8
2021-06-28 04:13:02 +00:00
Bonian Chen
80d7c162d6 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: I527a0776f2d90cd46e79d1a6166c9299d0455d15
2021-06-28 04:03:59 +00:00
Bonian Chen
8e80d83db5 [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: I082fadec71144aa9704292de422a4a8f2deb55ab
2021-06-28 04:03:58 +00:00
Bonian Chen
aaea164675 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: I43500208af3d17787ad7065cfe05735486ef2cce
2021-06-28 04:02:18 +00:00
Bonian Chen
b45ea80636 [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: I3d56a66613cb0b2a6b187f9be672d9b03f5385a1
2021-06-28 04:02:17 +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
14920afb08 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: Iac6365f7e239d3d5472807e82de49526e48aeb52
2021-06-28 03:57:57 +00:00
Arc Wang
659eb02d2d 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: Iadf3b86d87e11e481f5ea7161c5e8c3ab6b0f2bb
2021-06-28 03:56:15 +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
e7679a06b6 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 46398c4a58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I7ed5146fa41fa50b2e64ac82b9c8276d3b0d3262
2021-06-28 03:43:30 +00:00
TreeHugger Robot
3700019007 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 3e8addbb80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I99bbdd63385d92133b5feda79de2a3f3db29f724
2021-06-28 03:42:57 +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
3e8addbb80 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: I8d0dcebbcbc2d7bf4d2e221ffb7eacc96f95df0d
2021-06-28 03:25:07 +00:00
TreeHugger Robot
46398c4a58 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: I9f7c5cec36fd05f66f274a6321707ea5c3ef4d47
2021-06-28 03:24:11 +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
1588b767d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: d003b5deb2 -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: I42eb96272f09a8bb2228a42af5858659be5674f8
2021-06-26 05:27:27 +00:00
TreeHugger Robot
f1a39792c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours am: 7fe4564a4a -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: I9e9553245f300363caef2a3c59aa6dd848afabb9
2021-06-26 05:27:23 +00:00
Bill Yi
2781ab4e3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 6f34ea57ff -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: Ia46ad1dcbe58428fcf551c5f9454fa4437d9249f
2021-06-26 05:27:19 +00:00
TreeHugger Robot
cd028a9a9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1060b2f926 -s ours am: 409be78320 -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: I42273ba1417b997b853e485e600c8a0882e775fd
2021-06-26 05:24:29 +00:00
TreeHugger Robot
119268df3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459 -s ours am: e78163f7c7 -s ours am: 8c307c4d67 -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: I61d9fc85e7ffae0117b69e05423f7402d0603cbc
2021-06-26 05:24:25 +00:00
Bill Yi
43da1b001b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab -s ours am: 4621b36198 -s ours am: 3cad327a2a -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: I9cd1dca4bdf983e95990c82dd8038c46564b877d
2021-06-26 05:24:21 +00:00
TreeHugger Robot
929c3860be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 926cffbbea -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: If18b947bafefef0be6147d5962cc694616a8713b
2021-06-26 05:24:16 +00:00
Bill Yi
b3ae3367e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba -s ours am: 28cd196a94 -s ours am: 76310b46a4 -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: I80ce7bc06e042ca031cb14aade3fa094c67e9587
2021-06-26 05:24:12 +00:00
TreeHugger Robot
d003b5deb2 [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: I588d2d6e70e1b14c6678801dc9fd453f6ebe987e
2021-06-26 05:24:03 +00:00
TreeHugger Robot
51fd3b4ae4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799 -s ours am: cadaadb462 -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: I1ea27380501919a7219475dff83ecfc921dd85fe
2021-06-26 05:24:00 +00:00
TreeHugger Robot
7fe4564a4a [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: I8c29941351f340836a96211583e67f4371e9ad38
2021-06-26 05:23:59 +00:00
Bill Yi
6f34ea57ff [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: I44b519ea49dd847cdd65deb7cf0f9aff23ac2e5c
2021-06-26 05:23:53 +00:00
TreeHugger Robot
e325e43e75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b -s ours am: ce6e84f830 -s ours am: 314dad2e61 -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: Ib14f62f48d2db8eeea7f2f90d8381e27fd46c680
2021-06-26 05:23:45 +00:00