Yanting Yang
74a78df59f
Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485
am: bd4c63d432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756
Change-Id: Icf63a9eecff0c77973208ff34506621ad1fe4c22
2021-05-26 11:46:26 +00:00
Yanting Yang
1bb90c656f
Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463
am: 862d38391f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193
Change-Id: I4a5c6a9ae96ecb9818a0434bd33503d6110c07fa
2021-05-26 11:46:20 +00:00
TreeHugger Robot
aa07de4568
Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
am: 818c2f8d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190
Change-Id: I15940fcc2640defcb8055539bb04d4a897dde774
2021-05-26 11:46:15 +00:00
TreeHugger Robot
1f38afa85f
Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
am: 40193db75a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654
Change-Id: I6f3736de63f9616f94c6b04fc965ad7906e3f090
2021-05-26 11:46:10 +00:00
TreeHugger Robot
efdc3e7ab7
Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
am: c610712c92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355
Change-Id: I6ce057f3e8c08f6727a36340e3c965f1d4bdf840
2021-05-26 11:46:03 +00:00
TreeHugger Robot
07e81cb10d
Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
am: 4864db2bd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432
Change-Id: Ifea3b86f9663293586e96cd065d3c43fe38d5bf9
2021-05-26 11:45:58 +00:00
Weng Su
9512d53697
Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev
2021-05-26 11:45:00 +00:00
Weng Su
a2084a63c6
[Provider model] Add "See all" text link to Internet Panel
...
- Add "See all" text link at the bottom of the network providers list
- Don't show "See all" text link if the Wi-Fi network is empty
Bug: 188710392
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: If99c1e6597b4d2ef6a916fbdab3df9cfad8b464e
2021-05-26 11:44:09 +00:00
Weng Su
59f7b677fe
Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev
2021-05-26 11:43:49 +00:00
YUKAI HUNG
149c757f86
Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397
Change-Id: Ia90566ef7aff8a60e9f0fb21c9dffd9bf3a1a56b
2021-05-26 11:42:22 +00:00
Jason Chiu
31a25eb8a1
Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966
Change-Id: I47e8bef5bbf4e3a5cd423cf5d04445adef726a20
2021-05-26 11:38:13 +00:00
Wesley Wang
c31b028ba0
Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372
Change-Id: I29970d536c5dd2ffe5413061928d1cb978b35e99
2021-05-26 11:37:57 +00:00
Yanting Yang
08c67d8cef
Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095
Change-Id: I8fa63f8447d99f48bdae3d5e1ba58753fde76e81
2021-05-26 11:37:42 +00:00
TreeHugger Robot
62208d1274
Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962
Change-Id: I3b3ba14e9380072ec13afac0a1d4fd696f7881bc
2021-05-26 11:36:44 +00:00
Yanting Yang
bd4c63d432
Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756
Change-Id: I49381b1868b499b0eecd09fcbf969c4339e785fe
2021-05-26 11:36:24 +00:00
Yanting Yang
862d38391f
Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193
Change-Id: I26c725ce312d62653c689418562242811ab1000f
2021-05-26 11:36:17 +00:00
TreeHugger Robot
818c2f8d36
Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190
Change-Id: I2e41a3834944973c090e7cc73593d1c6b65afe3f
2021-05-26 11:36:12 +00:00
TreeHugger Robot
40193db75a
Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654
Change-Id: I9486dc943c15644abe1db02c2ea5f6491ddebf50
2021-05-26 11:36:06 +00:00
TreeHugger Robot
c610712c92
Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355
Change-Id: I8e4b41a4263c3e4a06ffbfc3ed93b11a8d4dff76
2021-05-26 11:33:14 +00:00
TreeHugger Robot
4864db2bd4
Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432
Change-Id: I90900ad74a6528b9106f20200767d5f2ae3a630d
2021-05-26 11:33:07 +00:00
Felipe Leme
f782a69de1
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
am: 37c36324f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084
Change-Id: I5a19db6140c9270a6d6232821e5a7fc2d8ca0cf6
2021-05-26 11:21:34 +00:00
TreeHugger Robot
bb3dce8c9b
Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
am: 154e668da7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760
Change-Id: Ied3db84867c9908fcdfabe2d6baa72b86691ba1a
2021-05-26 11:19:30 +00:00
TreeHugger Robot
31fb6a2bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours am: 37947fc40c
-s ours am: 0e9522b076
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: Ic68ee67ed19d374595195ee2fce11dccfbf4af03
2021-05-26 11:19:03 +00:00
Bill Yi
6ddd7ad01f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours am: 1474e88ef3
-s ours am: b00c1efc8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: I6eb6f906fdcb721e16e3e7740a79c5fcb79adef0
2021-05-26 11:18:48 +00:00
TreeHugger Robot
ef90b54883
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6
-s ours am: f556c56609
-s ours am: 9065eb3210
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710137
Change-Id: I161fb08d6011d54db61298575c0d55658bc791eb
2021-05-26 11:18:17 +00:00
Bill Yi
2db38749b8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df
-s ours am: 9769c467a3
-s ours am: 046a9c0cf4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710138
Change-Id: I68c99738ff14aec272ae3b95764ad1aa5513f101
2021-05-26 11:17:59 +00:00
TreeHugger Robot
e38629984e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6
-s ours am: ae2b2f8b49
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710143
Change-Id: I7f8566e696824757e9537555be1e50592baab6a0
2021-05-26 11:17:32 +00:00
TreeHugger Robot
b6194a0a6d
Merge "Update fonts & colors" into sc-dev am: bdd98ec216
am: 84a7d602f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067
Change-Id: I1fd37bcd59631ab7f8424088ba476d4db4242c22
2021-05-26 11:17:13 +00:00
TreeHugger Robot
175dc29f82
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1
-s ours am: a17ed53f3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710140
Change-Id: Ifd0d4b4721467dc2d48d089c1407ba636882de35
2021-05-26 11:17:09 +00:00
Yanting Yang
ab6138d428
Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
am: b3ce2ff016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192
Change-Id: I685844009b94278ce193ed70228a05f3a36dae1b
2021-05-26 11:15:12 +00:00
Jernej Virag
1313c0dd3a
Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e
am: e26626e29c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326
Change-Id: Ic9deaccc9b197500129f12c23d4d8884a67d5fd9
2021-05-26 11:14:53 +00:00
TreeHugger Robot
053c22a2a8
Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735
am: 8b5566614f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964
Change-Id: I648c332b1e1355998385cbebcc6a7f89aab68733
2021-05-26 11:13:45 +00:00
Yanting Yang
db776cb416
Merge "Remove Advanced section" into sc-dev am: 5dede180cd
am: 2d7a5d1fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191
Change-Id: I6955484711e1d219de54c385c955d0b64c255ea1
2021-05-26 11:12:39 +00:00
Felipe Leme
37c36324f0
Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084
Change-Id: I454ed375f20c77f6c911214e465e46b86598e1b9
2021-05-26 11:08:49 +00:00
TreeHugger Robot
154e668da7
Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760
Change-Id: If7f51e788545028384565b3657940027d8173b2f
2021-05-26 11:08:36 +00:00
TreeHugger Robot
0e9522b076
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a75a0302cc
-s ours am: 37947fc40c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710135
Change-Id: I9737e8a498870b10348ef9b393a65541bdcf35f1
2021-05-26 11:08:31 +00:00
Bill Yi
b00c1efc8e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64
-s ours am: 1474e88ef3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710136
Change-Id: Ia3e31c7d283823ea9d67f1630d1e55c38d6e0e5e
2021-05-26 11:08:27 +00:00
TreeHugger Robot
9065eb3210
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 64d9cc56c6
-s ours am: f556c56609
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710137
Change-Id: I55f7d48c081e171cb372753cf6ebddc280e5dfe5
2021-05-26 11:08:24 +00:00
Bill Yi
046a9c0cf4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df
-s ours am: 9769c467a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710138
Change-Id: Ia1baf4a60467289081501a1edfe69f8b7230b5ad
2021-05-26 11:08:20 +00:00
TreeHugger Robot
ae2b2f8b49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710143
Change-Id: I9309c17d9aefe484a293ad4256d652e0aee7d552
2021-05-26 11:08:00 +00:00
TreeHugger Robot
84a7d602f5
Merge "Update fonts & colors" into sc-dev am: bdd98ec216
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067
Change-Id: I720e32099f9cf984eecd3e51e3065f0827018a2a
2021-05-26 11:07:56 +00:00
TreeHugger Robot
a17ed53f3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14710140
Change-Id: If34a9493ed7fbabe2ff784a021a48e6513b6bb64
2021-05-26 11:07:50 +00:00
Yanting Yang
b3ce2ff016
Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192
Change-Id: I85fcdffc9b1f67298f03a9055b8bda919c4ac715
2021-05-26 11:07:46 +00:00
Jernej Virag
e26626e29c
Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326
Change-Id: If2bbba01418485dec658f11b7ba211f1ce6eb460
2021-05-26 11:07:41 +00:00
TreeHugger Robot
8b5566614f
Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964
Change-Id: Icf4b9f32aa8e0c0d98762d1f6616863bb4607765
2021-05-26 11:07:33 +00:00
Yanting Yang
2d7a5d1fe9
Merge "Remove Advanced section" into sc-dev am: 5dede180cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191
Change-Id: I0ca163db73e4b451b1be7c8325095db9d20fb31f
2021-05-26 11:07:24 +00:00
TreeHugger Robot
c7d1192ebb
Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
am: cd82b94eff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099
Change-Id: I992f1c528ea4643e9ac13fe72481b8847dbafdd3
2021-05-26 11:01:25 +00:00
Automerger Merge Worker
e959cc554f
Merge "Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: 9e9c2508bf" into sc-v2-dev-plus-aosp
2021-05-26 11:01:20 +00:00
TreeHugger Robot
3b5672415e
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: 9e9c2508bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711
Change-Id: I71cf66171c5211375fedb8cf5f4a2667937f02e9
2021-05-26 11:01:17 +00:00
TreeHugger Robot
1777269c87
Merge "Support different types of transitions." into sc-dev am: 332ee0f374
am: 49d0153039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961
Change-Id: I8816392867a15914859d10d62e73219319516514
2021-05-26 11:01:13 +00:00