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
701e7ac791
Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079
Change-Id: Idc410ea7b1d307dfffe2bd34282e5dd3f52bbe3e
2021-05-26 17:05: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
Jay Aliomer
225607b6eb
Rounded ripple notification history snoozed list
...
currently the ripple has sharpe edges and outside the view bounds
Fixes: b/187868531
Test: Visual
Change-Id: Iedacc6b875fa3bc4319d5e81034777dd873f7e26
2021-05-26 11:55:56 -04:00
Beth Thibodeau
b7993699ba
Add recommendation setting and remove app settings
...
- Add a new setting to control whether smartspace recommendations are
enabled
- Remove setting to block individual apps from resumption
- Update strings for existing resume setting
Bug: 187925818
Test: atest SettingsProviderTest
Test: atest MediaControlsRecommendationControllerTest
Test: atest MediaControlsPreferenceControllerTest
Change-Id: I4bd6a420e01e8c44f4db8be477557501648cc8d7
2021-05-26 11:00:25 -04:00
Weng Su
91ac1eb149
[Provider model] Update the Wi-Fi icons in the Settings
...
- Use the same Wi-Fi icons between "Network details" Settings and
Internet Panel
Bug: 188660580
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Icefc08eb47d2d573e26ff82b6a141cf55ce787c5
2021-05-26 21:50:55 +08: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
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
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
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
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
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
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
7164ec8863
Merge "Disable app usage item if this item is not clickable" into sc-dev
2021-05-26 09:25:54 +00:00
Weng Su
7b8c367d4f
[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel
...
- Replace the left menu button with "Turn off/on Wi-Fi"
- Remove the TurnOnWifiSlice
- Show "Wi-Fi is off" sub-title when Wi-Fi is disabled
- Remove the "Wi\u-Fi is turned on" sub-title when APM is on.
Bug: 188710392
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.panel
Change-Id: I53e200f6cadf8b712bf794bcbd5ff79f0f239cc0
2021-05-26 17:22:38 +08:00
TreeHugger Robot
328de8d98f
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev
2021-05-26 09:21:34 +00:00