Commit Graph

85815 Commits

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

Change-Id: I2394ebd50b60134094df4a6d7dc482dbf6f7e247
2021-05-26 19:30:27 +00:00
TreeHugger Robot
29a26dfd66 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: b834409f7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: I737c5bac694183784090dcc65019647e975e462f
2021-05-26 19:17:05 +00:00
TreeHugger Robot
434920c3e6 Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f am: fcbf881fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ia70c7d7580c4fb960d9146a650d2e87717bed2fe
2021-05-26 19:15:09 +00:00
Yanting Yang
098a17ccb2 Remove silky flag from tests for official release
Bug: 183670633
Test: robotests
Change-Id: Ie78a35cfc73632dcb638b78e952a1093926763bb
2021-05-27 03:05:55 +08:00
TreeHugger Robot
fcbf881fc2 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: I14cafe3cfd4d5c4a3996e58ff6844192877f02eb
2021-05-26 18:51:26 +00:00
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
c2c75862ba Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev am: b66e797567 am: 1702a9e6d6 am: 4497e55c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491467

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

Change-Id: Ibb631b37c2d1bf3e8dadda8e703d33a58a7e6495
2021-05-26 18:21:53 +00:00
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
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
Rajeev Kumar
db916e8bee Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev am: 265dd55235 am: 701e7ac791 am: 0924217fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14725079

Change-Id: If6489a4123bb1339630f1a4a898eda10bbdab4e7
2021-05-26 17:43:23 +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
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
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