TreeHugger Robot
d7c6436ea4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: bd1e418efc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I1e5798698816606874a2a0484483676c0a8a4395
2021-08-13 18:57:30 +00:00
TreeHugger Robot
edcd71932d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 652c469f3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Ic5bf78646bd77133d4be55f6a6f1efb5945fbf48
2021-08-13 18:57:07 +00:00
TreeHugger Robot
4ea6925fef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 612fb2cb80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Ife677d18adbe03098d2bc79838a43f4160edd214
2021-08-13 18:56:45 +00:00
TreeHugger Robot
bffa291613
Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: Ib8fe9ef33a165a53b8a6666bfc5168a9aa319910
2021-08-13 18:56:17 +00:00
Bill Yi
9a2aa2693b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 am: f13f8b9065 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I930287a57bec566acad4a3689a47f5b873125ea0
2021-08-13 18:56:16 +00:00
TreeHugger Robot
cc5b59c9a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I43fffed8c0c65794a17abeaea2a64e76a318000e
2021-08-13 18:56:01 +00:00
TreeHugger Robot
7508bd0cd2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I4fcd4bde39ddac78133671de50de523056314084
2021-08-13 18:55:57 +00:00
TreeHugger Robot
bd1e418efc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I793e523c10810844fb64372eb180a0e407781c77
2021-08-13 18:55:56 +00:00
TreeHugger Robot
3759660383
Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I9b261d4912dc44f2e51bb93cfbd840cff2ed3103
2021-08-13 18:55:50 +00:00
Bill Yi
4948e577ec
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c am: f13d3514ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Id1f4451bf15b34bf43549634694a5ef4726739d9
2021-08-13 18:55:49 +00:00
TreeHugger Robot
652c469f3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: I815717369e7fc642b3180aaee3e88b496998ee9d
2021-08-13 18:55:20 +00:00
TreeHugger Robot
612fb2cb80
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I38366b1c022b346a321b3f9b1d6206a750a4804a
2021-08-13 18:55:15 +00:00
TreeHugger Robot
96bd289bf7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I947c5595859294f600c17d4d3286769211f2e7a3
2021-08-13 18:54:45 +00:00
TreeHugger Robot
a755975337
Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I82e3a26cc692f9e4ac6f4b290cd98f62b9af17e4
2021-08-13 18:54:37 +00:00
Bill Yi
329d98ec28
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 am: db32ad43da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: Ia4d00cbba0360017a08fcb0afbf0dbdf07ed3e06
2021-08-13 18:54:36 +00:00
TreeHugger Robot
737f4d76c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:50:16 +00:00
TreeHugger Robot
afa6f208d0
Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:45:05 +00:00
TreeHugger Robot
255f31826f
Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
2021-08-13 18:45:05 +00:00
TreeHugger Robot
693cecdc4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: If6655610b1bb63b2fccf1ac6a80c0d6546258bc5
2021-08-13 18:40:01 +00:00
TreeHugger Robot
b75551a41c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:39:35 +00:00
TreeHugger Robot
3f6005944c
Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
2021-08-13 18:39:35 +00:00
Bill Yi
b03c6ba2ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: Ibf21530c978fe920d3f855aae80f6ab898d4caac
2021-08-13 18:39:26 +00:00
TreeHugger Robot
e4de411880
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: e245bf8e66 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I330cd109eef07b6ad94f221b946ac70c46f6f484
2021-08-13 18:33:43 +00:00
Bill Yi
4d68983581
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I6cc31a337e002d9cddd3e5c42966a0059a0786c3
2021-08-13 18:32:56 +00:00
TreeHugger Robot
de4d5cb3f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I31207099de86903024e9d1b4a7e272e312a5cfcf
2021-08-13 18:22:30 +00:00
Bill Yi
4a7acc1636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: Ia9390d5d0ecc35c365747ecead6f3cb48ff8eb95
2021-08-13 18:22:28 +00:00
TreeHugger Robot
e245bf8e66
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: I93a887f210b6bbea351522f0d423664c25715871
2021-08-13 18:21:24 +00:00
Bill Yi
e7eff15e83
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I9ba31d3695cdea83bbdbc505fee4ccfab6fc9faf
2021-08-13 18:21:09 +00:00
TreeHugger Robot
ede03fcc17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-13 17:59:41 +00:00
Alfred Lin
7f8e775754
Prototyping : Demo Image on color setting
...
Implement prototyping of demo image on color setting
Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
2021-08-13 15:08:58 +00:00
Zoey Chen
6ce608787b
[Provider Model] Redirect Settings Internet panel request to SystemUI.
...
From QPR, the panel should be launched from SystemUI, so redirect the panel to SystemUI
Test: make
Bug: 187779230
Change-Id: I5b4131c4d986399944c038f8bce0723fcb5ba3b3
(cherry picked from commit ab8a922f77
2021-08-13 14:07:01 +00:00
Tsung-Mao Fang
74b1a46cb1
Move Automatic System Updates from Developer Options to System
...
- Move the preference to the system xml file.
- DisableAutomaticUpdatesPreferenceController should not
inherit from the developer preference controller now since it's not used
in developer page anymore. Instead, just use toggle preference
controller for changing the state.
- Rewrite the test cases based on new controller.
Test: The ui works well and search can navigate to correct path.
Fix: 196001125
Change-Id: Iaea3e11d9cdbfa073ebd41bc3c84356d564c7e71
2021-08-13 08:11:22 +00:00
TreeHugger Robot
597ca951a9
Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623
Change-Id: I31d94c633afda15f05d660e6854c2b6c552a6d7a
2021-08-13 04:27:14 +00:00
TreeHugger Robot
1741d5d12c
Merge "Handle spanned conversation labels" into sc-qpr1-dev
2021-08-13 04:11:04 +00:00
Bill Yi
f13f8b9065
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919
Change-Id: I53d51fa42b4a0bd99c581205a438c09f75b24bf5
2021-08-13 03:49:10 +00:00
Bill Yi
d486302dc9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
2021-08-13 03:48:58 +00:00
Bill Yi
f13d3514ec
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913
Change-Id: Iee4e7722d362e9bde4b19e403cb5bdcdb84d5931
2021-08-13 03:42:40 +00:00
Bill Yi
f30152962c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
2021-08-13 03:42:27 +00:00
Bill Yi
db32ad43da
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901
Change-Id: I1716107ca1ede70291c80c65f838c80106296a80
2021-08-13 03:33:05 +00:00
Bill Yi
d9ba125bb8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
2021-08-13 03:24:52 +00:00
Bill Yi
ca003ac628
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b8e508353852d4626453b56e71f222ab40c7f6f
2021-08-13 03:13:32 +00:00
Bill Yi
914383ee99
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia4a9c0e4621a7a13ac202564ae83d45a44a94517
2021-08-13 03:08:13 +00:00
Joe Bolinger
3872ed4b8c
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 am: 2c0b7fdb90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: Icd38b59e5a51d273bc767b2b135e9d996a41f77b
2021-08-13 01:16:46 +00:00
Kevin Chyn
bf8ad9f293
Do not show work profile strings for parent-managed enrollment am: 570540b15c am: 61c508e0a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128
Change-Id: Ieb43218dd4ab0b2e32607ac0df6ee14d827851bb
2021-08-13 01:16:38 +00:00
Joe Bolinger
2c0b7fdb90
Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813
Change-Id: Ia879a9fc3d00f2a04062d58df740fcb0c7281c93
2021-08-13 01:16:37 +00:00
