Commit Graph

82909 Commits

Author SHA1 Message Date
TreeHugger Robot
b834409f7c Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ic555a2748a97b1ffe3f99101416d31e1de264c5a
2021-05-26 18:49:38 +00:00
TreeHugger Robot
1e747a593f Merge "Rounded ripple notification history snoozed list" into sc-dev 2021-05-26 18:33:23 +00:00
Peter Wang
4497e55c03 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 1702a9e6d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I4c49a8ab1845b24d19523182889d9d0a5b67683d
2021-05-26 18:07:21 +00:00
Abel Tesfaye
697ced2aab Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313 am: 1ab73ef6e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: I41b326ae88c9523de907f6502ac6e197019ac2fe
2021-05-26 18:07:07 +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
Peter Wang
4a7132d851 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I61ec5956d6f72249213c6cbfe30798df82c09dc4
2021-05-26 17:44:55 +00:00
Abel Tesfaye
ac08b132bf Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: I76971481cdae4b39d579934952a758aa449b771f
2021-05-26 17:44:00 +00:00
Peter Wang
1702a9e6d6 Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

Change-Id: I3572fc02e3731973ff74f4f0cae6f61e897dfe9e
2021-05-26 17:42:45 +00:00
Abel Tesfaye
1ab73ef6e8 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev am: 3b3187b313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14684634

Change-Id: Ic8f18ad55c97b02bef13d344c29967444a7282e6
2021-05-26 17:42:36 +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
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
TreeHugger Robot
8cb761e3d7 Merge "Fix connected devices settings jank issue" into sc-dev 2021-05-26 12:36:44 +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
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
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
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