Commit Graph

90494 Commits

Author SHA1 Message Date
Xin Li
69e79704e3 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: bf45599d43 -s ours
am skip reason: Merged-In I9ac05f5da437030e1b5db082ddaf7959f82acccd with SHA-1 d3f9214763 is already in history

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

Change-Id: Ibb132379ab32739f0c9bdc29ded3159775eb884e
2021-11-18 22:00:58 +00:00
Kevin Han
6dc2c76da0 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev am: 83a8b76ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16286576

Change-Id: Icacd93b1f5b0cfe950dd4e4ccc0f8081ad1d58c3
2021-11-18 21:58:23 +00:00
Kevin Han
83a8b76ec2 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev 2021-11-18 21:37:46 +00:00
TreeHugger Robot
3af8d0fdf4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours am: 03b049e8cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaec414e27d113ed2935d442def4e69eadaf74ea3
2021-11-18 19:53:17 +00:00
TreeHugger Robot
1c1cca3fa8 Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1 am: 20a56f067a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832

Change-Id: I84eb542d98a6567393a82078d952947f22d81ecc
2021-11-18 19:52:00 +00:00
Bill Yi
8cfcd3f8bb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours am: 24060f7b4f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91fa2609b540005ac9c29fefd846cdd820783ce3
2021-11-18 19:51:59 +00:00
TreeHugger Robot
4650df393f Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8 am: 0b90ee1161
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: If48d4c7f61d9abfff22c2b33696eed6d884e021c
2021-11-18 19:51:25 +00:00
Bill Yi
f9aa5fb568 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours am: 6caa602d7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0730f975f740306388c2663f86c520d05cedcfea
2021-11-18 19:51:24 +00:00
TreeHugger Robot
bc3feb94f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours am: 1570dd46ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ce2ac14089aec471c80bde90416ac570b8e02a9
2021-11-18 19:50:54 +00:00
TreeHugger Robot
0435e675b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours am: 008f9a695a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a12ff091258393b27bec6970430b295577261dd
2021-11-18 19:50:14 +00:00
TreeHugger Robot
d797c14cb4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6def0ab1ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc9ba975adf40525ab93c7ed98e06e791dd31272
2021-11-18 19:49:34 +00:00
TreeHugger Robot
319d3ba8ad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3b9da31dfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff7e81bb462c883deeba9b476d137994b303fbb0
2021-11-18 19:49:04 +00:00
Zoey Chen
ca02377238 Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: I40d08bd3d76425c504c2f17cf73a36e36d261615
2021-11-18 19:48:11 +00:00
Jason Chiu
e7a681748e Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev am: b4d3278a45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263226

Change-Id: Id203bbb5f0d0e0c345494c111ad8c0c296b8e6e5
2021-11-18 19:48:02 +00:00
Jason Hsu
105bca800a Merge "Provide ability to link to Color Inversion page via Intent" into sc-v2-dev am: 0a8f978357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013675

Change-Id: Ia9b87f0a221574c54d65700da9f046b301b7d3b5
2021-11-18 19:46:47 +00:00
TreeHugger Robot
cbd71ccc5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours am: 062c92d459 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10ff3715db31c7256399a8afa33e533c3426089a
2021-11-18 19:42:17 +00:00
TreeHugger Robot
89859355d4 Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1 am: 026f820cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832

Change-Id: Idc52fd351f28d0c15d1020fdf7dbfea938db753e
2021-11-18 19:42:13 +00:00
Bill Yi
571f09d5a9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours am: c4894489f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6783ea7003080287c8e801822e56560c16af8c7
2021-11-18 19:42:10 +00:00
TreeHugger Robot
062c92d459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idad6caf7532b3c1d08bf007708bb05a0212c95e7
2021-11-18 19:22:43 +00:00
TreeHugger Robot
03b049e8cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5df51725bdc32edb3d2fa43b0cf48e86b5d85517
2021-11-18 19:22:38 +00:00
TreeHugger Robot
026f820cce Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832

Change-Id: I085605b91279dd2ff342a5e79b613ee3a35ac43a
2021-11-18 19:22:38 +00:00
Bill Yi
c4894489f5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6849598109a72f67c61be1f614e162cf9de38f9d
2021-11-18 19:22:36 +00:00
TreeHugger Robot
20a56f067a Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev am: 6cae0edae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832

Change-Id: Ib799378b91a9cdb1219caef564a86f2e4b8e4867
2021-11-18 19:22:33 +00:00
Bill Yi
24060f7b4f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9 am: 61505e7824 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c94df8b15ec9be39fdb6d1f52f3b372bd144aff
2021-11-18 19:22:32 +00:00
TreeHugger Robot
9adb10d6fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47c73fbaece5fa90f127335d93cf439b7ec9e720
2021-11-18 19:22:29 +00:00
TreeHugger Robot
ebd2e1f662 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-18 19:06:29 +00:00
TreeHugger Robot
6cae0edae1 Merge changes from topic "presubmit-am-54d98b71e97148f688d58b0d364066e1" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
  Import translations. DO NOT MERGE ANYWHERE
2021-11-18 19:06:29 +00:00
TreeHugger Robot
08d23b359d Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8 am: db6bdc35f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I49ce059279e1e7f3084c187885411d15f4b6494c
2021-11-18 18:33:07 +00:00
Bill Yi
1639e278b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours am: 931145f30e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d5616815c882ac9ba6d2fcdd3f1425dc0835080
2021-11-18 18:33:03 +00:00
TreeHugger Robot
db6bdc35f2 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I25e1e2e362a458362025d435667133d37621dd02
2021-11-18 18:08:20 +00:00
TreeHugger Robot
0b90ee1161 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440

Change-Id: I72bf940f930e719a477f6b42b20b50274055c77b
2021-11-18 18:08:19 +00:00
Bill Yi
6caa602d7c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib53980b3ddd22ced1afceb89619d41b7a2f4f2d1
2021-11-18 18:08:17 +00:00
Bill Yi
931145f30e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9 am: d86da91c3e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
2021-11-18 18:08:17 +00:00
TreeHugger Robot
1ed1be15d8 Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
  Import translations. DO NOT MERGE ANYWHERE
2021-11-18 17:51:48 +00:00
TreeHugger Robot
17896e0e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours am: 6e7435398e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a7fc5c781d8d73fbccf99b4409ba2985f253c33
2021-11-18 17:20:03 +00:00
TreeHugger Robot
ff7e972fa7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours am: 0b17afd619 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f0a50f7dd8d75e9d82cb7a820d0d6bd69e87d74
2021-11-18 17:19:56 +00:00
TreeHugger Robot
6e7435398e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabd4701965c8f88c200a616310481fd330114671
2021-11-18 17:02:48 +00:00
TreeHugger Robot
1570dd46ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If66bb532425e4939edaad9cd436fd98c21be3e05
2021-11-18 17:02:41 +00:00
TreeHugger Robot
0b17afd619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
2021-11-18 17:02:38 +00:00
TreeHugger Robot
008f9a695a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f3d6faedc496c21d83922fe84dd4b4809a54732
2021-11-18 17:02:35 +00:00
TreeHugger Robot
fda2135c78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:57:43 +00:00
TreeHugger Robot
6def0ab1ed Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-18 16:51:55 +00:00
TreeHugger Robot
3b9da31dfb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-11-18 16:50:12 +00:00
TreeHugger Robot
277f726266 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-18 16:49:54 +00:00
Zoey Chen
c8ee867f2d Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev
* changes:
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
  [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
2021-11-18 13:26:31 +00:00
Tsung-Mao Fang
251e326d21 Redesign homepage layout for two-pane mode.
In a high level, I created two versions of app bar layout.
One for single pane design, another for two-pane design.

Then, app initilizes two different layouts in the beginning,
we simply show/hide one version while app is receiving the
configuration changes update.

Test: Rebuilt apk and observed the screen.
Bug: 195293058
Change-Id: Icd19ea02ab1be4e964701b22ae9e20c9e00d3c0d
2021-11-18 21:07:26 +08:00
Bill Yi
54d766df82 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1047bd6af56fc7b7f07d8940746587e318dc86fa
2021-11-18 11:18:16 +00:00
Bill Yi
2c292c3bd0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
2021-11-18 11:14:31 +00:00
Bill Yi
61505e7824 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
Blank merge reason: commit message contains skip directive

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

Change-Id: I1ba27aa6206d0f3397fa2368b2e0a7aee2872242
2021-11-18 11:11:02 +00:00
Bill Yi
10928bfba9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
2021-11-18 11:10:53 +00:00