Peter Wang
5a8b9cbb4a
Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851 am: 0317a93e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467
Change-Id: I7d1b3bdb4da0f3838e365379f48bfa5a2c5d9318
2021-05-26 18:21:40 +00:00
Abel Tesfaye
a09530fd74
Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf am: 9612461482
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634
Change-Id: If7a094e22e7762e851fabef9740f9217a6eaf6b9
2021-05-26 18:21:03 +00:00
Peter Wang
0317a93e50
Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 4a7132d851
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467
Change-Id: Iaf038fe882d97014836467b30a0688b77ae9c834
2021-05-26 18:05:35 +00:00
Abel Tesfaye
9612461482
Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: ac08b132bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634
Change-Id: If68cfe699eaa550b79dbdb3e2c6feeefe5d1e0a0
2021-05-26 18:04:54 +00:00
Rajeev Kumar
0afd586789
Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 4c18ba65c6 am: ad4390f270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079
Change-Id: I3227b72270c88e88908c62b49710b09c5e4d7c1f
2021-05-26 17:42:32 +00:00
Peter Wang
b66e797567
Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev
2021-05-26 17:37:04 +00:00
Abel Tesfaye
3b3187b313
Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev
2021-05-26 17:26:31 +00:00
Rajeev Kumar
ad4390f270
Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 4c18ba65c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079
Change-Id: Id2406e89b1981a4ba3db62ca474fbd3ebc8f01b6
2021-05-26 17:21:07 +00:00
Rajeev Kumar
265dd55235
Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev
2021-05-26 16:46:58 +00:00
TreeHugger Robot
f6fe790b46
Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7 am: 219b5551ff am: 1ab8616bd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395
Change-Id: I919d4ad5372005a879dba92a4f66ddf375015bf3
2021-05-26 13:22:42 +00:00
TreeHugger Robot
219b5551ff
Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395
Change-Id: Ib2282657226b72bc0e11a0036897f5f0a653eab9
2021-05-26 12:52:19 +00:00
Weng Su
befa054914
Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697 am: 3ada3bd0b4 am: 085975957f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195
Change-Id: I8874a98ae63cb51b52b92e58a3bbfc36e34052d3
2021-05-26 12:37:10 +00:00
Weng Su
d03002319c
Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe am: d9a3515d36 am: e4b37f5333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752
Change-Id: Id72beec5954fb4cd875166b8969c6d7171255a48
2021-05-26 12:37:03 +00:00
TreeHugger Robot
8cb761e3d7
Merge "Fix connected devices settings jank issue" into sc-dev
2021-05-26 12:36:44 +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
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
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
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
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
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
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
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
49d0153039
Merge "Support different types of transitions." into sc-dev am: 332ee0f374
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682961
Change-Id: I57839d47380e9e56f1442f1d51c8254baf2be411
2021-05-26 10:53:30 +00:00
TreeHugger Robot
5b24943b06
Merge "Simplify the transition logic." into sc-dev
2021-05-26 10:45:41 +00:00
TreeHugger Robot
4f9d0f4eb4
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev
2021-05-26 10:26:20 +00:00
YUKAI HUNG
7045ec0b67
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 am: 64a11c5a87 am: ff51d80270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: Iba420b51045795d8ee9f42a1f030e63e020329f5
2021-05-26 09:52:23 +00:00
TreeHugger Robot
274ac5d14f
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f am: 9035a8f4bb am: 7839e46ba9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: I874e07dd128e42d293f43bcf6cfc5539b5293dd9
2021-05-26 09:52:08 +00:00
Yanting Yang
385d4ab587
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7 am: 97d6bac2f4 am: c6feed297f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: Idd559d7c16633e916e52d8fc346db801466ea948
2021-05-26 09:51:17 +00:00
Hugh Chen
51b6605aef
Fix connected devices settings jank issue
...
Completed the UI in displayPreference() to fix jank issue.
Bug: 188752628
Test: make RunSettingsRoboTests
Change-Id: Ib97b76e1b8622424ad481597f63d3540fb0bfc5b
2021-05-26 17:37:13 +08:00
YUKAI HUNG
ff51d80270
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863 am: 64a11c5a87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: I345c28cef4e81669aca4cf2e085e6ca5b167ee3e
2021-05-26 09:35:57 +00:00