Commit Graph

85947 Commits

Author SHA1 Message Date
Betty Chang
dc6f8b05aa Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb am: f823fef279
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: Ib50ed3e198d5811dd7486622ab8bca3f98ebba51
2021-05-26 11:58:40 +00:00
YUKAI HUNG
e84834e270 Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769 am: 149c757f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397

Change-Id: I7c9e1bb975e44fb649a6f9d0afd524d99d23e7e6
2021-05-26 11:58:14 +00:00
Felipe Leme
b58a53eeec Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4 am: 37c36324f0 am: f782a69de1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: If95ce8cb8473207ae71e40b3343640179bc7bb34
2021-05-26 11:54:28 +00:00
TreeHugger Robot
300a8f7cf7 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111 am: 154e668da7 am: bb3dce8c9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: I6c4c1e62a0de143eadd861ff31590ff10e0bdd52
2021-05-26 11:54:15 +00:00
TreeHugger Robot
66760d5db2 [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: 31fb6a2bac -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: I170b10dcc213405e45a11dbc9f27e034158f0100
2021-05-26 11:54:09 +00:00
Bill Yi
59038032f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59ac543b64 -s ours am: 1474e88ef3 -s ours am: b00c1efc8e -s ours am: 6ddd7ad01f -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: I7325fbf48d5375451b76271e60c8e14fa28f0db7
2021-05-26 11:54:04 +00:00
TreeHugger Robot
5ee48c8ee5 [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: ef90b54883 -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: I97e658d619e4f5ca8bb02dc394cd6ddb1c612a59
2021-05-26 11:53:59 +00:00
Bill Yi
9626e77c0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57f6bc1df -s ours am: 9769c467a3 -s ours am: 046a9c0cf4 -s ours am: 2db38749b8 -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: I74c931c81510dc569fd25a2c7d1ef2463a828c0a
2021-05-26 11:53:54 +00:00
TreeHugger Robot
a820c5cd39 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 00764f15b6 -s ours am: ae2b2f8b49 -s ours am: e38629984e -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: Ic9ea6bf9d7376edd5ec2043f3b99da27d2d279b6
2021-05-26 11:53:47 +00:00
TreeHugger Robot
8fd8f467ff Merge "Update fonts & colors" into sc-dev am: bdd98ec216 am: 84a7d602f5 am: b6194a0a6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702067

Change-Id: Ic5d5b901649900d155940fd50dbd48ec56c9cf09
2021-05-26 11:53:42 +00:00
TreeHugger Robot
b012902466 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2baf80f3a1 -s ours am: a17ed53f3a -s ours am: 175dc29f82 -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: Ie791b1c59eabfff5e063c32369accec58da1e696
2021-05-26 11:53:36 +00:00
Yanting Yang
8c90886ae5 Merge "Remove silky flag from Notifications for official release" into sc-dev am: ed671ebe6c am: b3ce2ff016 am: ab6138d428
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716192

Change-Id: Ifa579e92b404d9653dc79125ef25fcd02389593e
2021-05-26 11:53:30 +00:00
Weng Su
3ada3bd0b4 Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195

Change-Id: I6b93eac1a180ffe8b89781d528b3283579ba80f9
2021-05-26 11:51:50 +00:00
Weng Su
d9a3515d36 Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752

Change-Id: Ic11466d0b27fd71f28a751d5d3e6b86d83c7f080
2021-05-26 11:51:43 +00:00
TreeHugger Robot
45095a3c05 Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: I8feff12866ab838a4624926b42b7062668ab2f21
2021-05-26 11:51:38 +00:00
TreeHugger Robot
dcc576eae5 Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: I56489525d1b6fc5dfabe7088d193227e5d20da91
2021-05-26 11:51:25 +00:00
YUKAI HUNG
2fadc1091a Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402

Change-Id: I8885c5d58e1c92a83c9ce98b9954697ec8e81a59
2021-05-26 11:51:10 +00:00
TreeHugger Robot
58060be146 Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606

Change-Id: I1ebe9c7bd00acdf9e895db778762e246c7acf89e
2021-05-26 11:50:37 +00:00
Yanting Yang
da640bd9e2 Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096

Change-Id: I5797d14eab8e523b4d22da51c0e7cd83a090d139
2021-05-26 11:50:21 +00:00
Betty Chang
f823fef279 Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: I23fb515c4617d04755805bf44a56e8178b80d50a
2021-05-26 11:49:48 +00:00
Jason Chiu
365aa8eeae Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8 am: 31a25eb8a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966

Change-Id: I0b2dffbafdd5b4bd269fa9ab8d88ea664768874c
2021-05-26 11:48:05 +00:00
Wesley Wang
296297fda3 Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4 am: c31b028ba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372

Change-Id: I12ed6e2a4c21498975d6cbf5977fc202b221e490
2021-05-26 11:47:51 +00:00
Yanting Yang
d4d6cbe00f Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454 am: 08c67d8cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095

Change-Id: I51b0c4ab49516dbe9f513d995283c1e9b5208c44
2021-05-26 11:47:42 +00:00
TreeHugger Robot
f1edb1be26 Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783 am: 62208d1274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962

Change-Id: Ia13b8a53c9ad4020e202c54757d7af6f60db2b3c
2021-05-26 11:46:38 +00:00
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
Jernej Virag
0b25a7d88a Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev am: 1baf9a867e am: e26626e29c am: 1313c0dd3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502326

Change-Id: Iadc78c3eaa0f7e720e705dbe7d2ab0cbc0a19e10
2021-05-26 11:45:51 +00:00
TreeHugger Robot
a15e88e53c Merge "Suppress shared axis transition on Brightness level" into sc-dev am: b2a97fb735 am: 8b5566614f am: 053c22a2a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682964

Change-Id: Id46ea85d24eee69d4123b85cfb717e9cc4b52d96
2021-05-26 11:45:18 +00:00
Yanting Yang
dd65aa3faa Merge "Remove Advanced section" into sc-dev am: 5dede180cd am: 2d7a5d1fe9 am: db776cb416
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716191

Change-Id: I6bf4b71d63712f76cad9a79a1e773c63cf8d648f
2021-05-26 11:45:10 +00:00
TreeHugger Robot
86f4e4dc50 Merge "Simplify the transition logic." into sc-dev am: 5b24943b06 am: cd82b94eff am: c7d1192ebb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099

Change-Id: I4568cd1ae6d5ae639827e70144f083062f731d39
2021-05-26 11:45:03 +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
Automerger Merge Worker
709b855777 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 am: e959cc554f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711

Change-Id: Icf4d8d743fe6fef9949402dddb961d653032e2c0
2021-05-26 11:35:34 +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
TreeHugger Robot
bef59d99c8 Merge "Support different types of transitions." into sc-dev am: 332ee0f374 am: 49d0153039 am: 1777269c87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961

Change-Id: I647ee6a28a691132f5d5b49f0d01d4c72b86446d
2021-05-26 11:30:43 +00:00