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
0924217fce
Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235
am: 701e7ac791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079
Change-Id: I821b8ae810d9f650723045d73c5ca9226b101690
2021-05-26 17:22:16 +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
4c18ba65c6
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: I577bdade1ca658952fb98331d2d739e41c021e60
2021-05-26 17:06:47 +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
2f37e0414d
Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7
am: 749cc2afb9
am: 333c66c4c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395
Change-Id: I0b63bd9ff38bbbd07231ec9f2377527d0c979372
2021-05-26 13:23:02 +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
333c66c4c0
Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7
am: 749cc2afb9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395
Change-Id: Idc10fd9b1ddb5d24b1c58b13213feb49d7cc6ea5
2021-05-26 13:15:42 +00:00
TreeHugger Robot
1ab8616bd7
Merge "Fix connected devices settings jank issue" into sc-dev am: 8cb761e3d7
am: 219b5551ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702395
Change-Id: I3c9e38a2a1a24c3b43d03b251cd28b4e4a7d7357
2021-05-26 13:09:57 +00:00
TreeHugger Robot
749cc2afb9
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: I522ccb00abbd553af6813486e5ee3e5d07f4d849
2021-05-26 12:54:51 +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
92ab4a08c5
Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697
am: cf2a7810f3
am: 9f139a6c41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195
Change-Id: I20d12942e54ed2ac4ba5950b0d5ba4a2237274d3
2021-05-26 12:37:22 +00:00
Weng Su
d460b2bb2b
Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe
am: 802b9acbe2
am: 9d71a030c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752
Change-Id: Ia9d6a4eeebb442b16581ddba5a31797c87fe13ca
2021-05-26 12:37:16 +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
be6c9dc5d1
Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
am: 45095a3c05
am: 905350a9e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099
Change-Id: Ia88cc9a29afd79607a45899d4a949a57f51c0bb8
2021-05-26 12:36:57 +00:00
TreeHugger Robot
8cb761e3d7
Merge "Fix connected devices settings jank issue" into sc-dev
2021-05-26 12:36:44 +00:00
TreeHugger Robot
c76825be92
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: dcc576eae5
am: 9b4f755505
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711
Change-Id: Id89ef68fa28119f99e005a218be8e07824cc22e5
2021-05-26 12:36:38 +00:00
YUKAI HUNG
cda50efd95
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
am: 2fadc1091a
am: 890914ec27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: I06c6416454706dcad13272ec85faedc1248ade21
2021-05-26 12:36:12 +00:00
TreeHugger Robot
23ba18ed76
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
am: 58060be146
am: b1d1430630
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: I160b04b7dc46785b5047e6d37990e8cfc3ac9431
2021-05-26 12:35:49 +00:00
Yanting Yang
4d6176e8e5
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
am: da640bd9e2
am: 1f32a44468
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: Ia2907b7aa3830e7a0da803dabed177df70bbbbb8
2021-05-26 12:35:32 +00:00
Betty Chang
ffefb08a8e
Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb
am: f823fef279
am: dc6f8b05aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097
Change-Id: Ic3798d13f863758e7d49f4bf481138eaa6c327e7
2021-05-26 12:34:50 +00:00
YUKAI HUNG
d8b672428f
Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769
am: 149c757f86
am: e84834e270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397
Change-Id: I11b8b66a76632132292480ac2b6c443703e2e658
2021-05-26 12:34:30 +00:00
Jason Chiu
a713be0ec6
Merge "Add icon declaration in metadata for injected activities" into sc-dev am: a1b818a8d8
am: 31a25eb8a1
am: 365aa8eeae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682966
Change-Id: Iea4ed425f355e50e69d07be5da98764eb493137b
2021-05-26 12:22:31 +00:00
Wesley Wang
75a18d9d8e
Merge "Add new battery entry into AppInfo page launch variable" into sc-dev am: a967b88ee4
am: c31b028ba0
am: 296297fda3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639372
Change-Id: I6fbe96e7196f6378df6362c503fd9c49c40f8a9b
2021-05-26 12:22:16 +00:00
Yanting Yang
909a7c6f3e
Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev am: 4fce42c454
am: 08c67d8cef
am: d4d6cbe00f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716095
Change-Id: I2bc7241d22804336feffd0f80d8672ce61ccf743
2021-05-26 12:22:05 +00:00
Weng Su
9f139a6c41
Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697
am: cf2a7810f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195
Change-Id: Ic6993cc5340bbba8ac0d59a393bcaf819f5200e4
2021-05-26 12:20:27 +00:00
Weng Su
9d71a030c7
Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe
am: 802b9acbe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752
Change-Id: I599f23c68577e0212e8246eb0248962d9385fb25
2021-05-26 12:20:23 +00:00
TreeHugger Robot
d2c0d39c04
Merge "Tweak right padding for multiple preferences" into sc-dev am: f6d0845783
am: 62208d1274
am: f1edb1be26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14682962
Change-Id: Ic99831ea197ad413ae16e78b7a9c6b2352a40a2f
2021-05-26 12:19:28 +00:00
Yanting Yang
5fcc490351
Merge "Remove silky flag from Apps for official release" into sc-dev am: c10cfff485
am: bd4c63d432
am: 74a78df59f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702756
Change-Id: I68d72da767e7076e48c6298aa3dae9a1d305909e
2021-05-26 12:13:03 +00:00
Yanting Yang
5ee3cd3e87
Merge "Remove silky flag from App info for official release" into sc-dev am: bf99c92463
am: 862d38391f
am: 1bb90c656f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716193
Change-Id: I26c269e24bd850a9705f153115813c4f87bc3bf6
2021-05-26 12:12:54 +00:00
TreeHugger Robot
3ab070cf2c
Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
am: 818c2f8d36
am: aa07de4568
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190
Change-Id: Ib5d3b150752b05c43cb5b503fb46ad87fb35fc92
2021-05-26 12:12:47 +00:00
TreeHugger Robot
a9ff0c7596
Merge "Consolidate app notification setting prefs" into sc-dev am: a4fc228b55
am: 40193db75a
am: 1f38afa85f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14718654
Change-Id: Ibbfb911d8d0d23f8ec9160406f939be2e83e05c3
2021-05-26 12:12:41 +00:00
TreeHugger Robot
87a0c5df19
Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
am: c610712c92
am: efdc3e7ab7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355
Change-Id: I9e0c496531ffcc6e9b7f4103fb01a1b234662811
2021-05-26 12:12:33 +00:00
TreeHugger Robot
7b4421a930
Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
am: 4864db2bd4
am: 07e81cb10d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432
Change-Id: I1248aeda9d23862edf6b700f9f01fa22d17a4428
2021-05-26 12:05:57 +00:00
Weng Su
cf2a7810f3
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: I30c4ccacba4ccc032535f0a159be8d9e297d04d0
2021-05-26 12:05:37 +00:00
Weng Su
802b9acbe2
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: I16495e1a1171ae3a3a78ede194d2ded92057e76d
2021-05-26 12:05:30 +00:00
Weng Su
085975957f
Merge "[Provider model] Add "See all" text link to Internet Panel" into sc-dev am: 9512d53697
am: 3ada3bd0b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716195
Change-Id: Id5effee61cec81a6c23e8c942713184efaf5732e
2021-05-26 12:00:38 +00:00
Weng Su
e4b37f5333
Merge "[Provider model] Add "Turn off/on Wi-Fi" link to Internet Panel" into sc-dev am: 59f7b677fe
am: d9a3515d36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702752
Change-Id: Ic75f08c49b0749812f06fc3fe078770a3948f439
2021-05-26 12:00:34 +00:00
TreeHugger Robot
905350a9e6
Merge "Simplify the transition logic." into sc-dev am: 5b24943b06
am: 45095a3c05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716099
Change-Id: I95417ec91336dba6f2f6c69ab3dc2f224ce5c1b4
2021-05-26 12:00:28 +00:00
TreeHugger Robot
9b4f755505
Merge "Fix pairing dialog doesn't show the correct pairing key." into sc-dev am: 4f9d0f4eb4
am: dcc576eae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730711
Change-Id: I497d3fecd0d15e42450f62cdacbf3cd8de6ea61f
2021-05-26 12:00:23 +00:00
YUKAI HUNG
890914ec27
Merge "Disable app usage item if this item is not clickable" into sc-dev am: 7164ec8863
am: 2fadc1091a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702402
Change-Id: If34fbc6f04fa21b89e6c90e334c4671a2b097840
2021-05-26 12:00:18 +00:00
TreeHugger Robot
b1d1430630
Merge "Fix the extra speaking in Allow supervision dialog" into sc-dev am: 328de8d98f
am: 58060be146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14694606
Change-Id: I4d58b9204d3187273be179d47cce1f6692a049c1
2021-05-26 12:00:13 +00:00
Yanting Yang
1f32a44468
Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7
am: da640bd9e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096
Change-Id: I223ccbd4c336f59c2c6a2cf763a2c11e23ebb654
2021-05-26 12:00:02 +00:00