Commit Graph

23721 Commits

Author SHA1 Message Date
Beth Thibodeau
910d1f7aa8 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: b7749fd405 am: baf515ee95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I300769f058b71090dee2d9581dab72c1e1332031
2021-05-28 03:06:49 +00:00
Kevin Chyn
5ee511cdf2 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: e6eb1020f8 am: a0adbe1918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I9812b61f0a82038d53d8d63837c9305ac6bbec12
2021-05-28 03:06:28 +00:00
TreeHugger Robot
2a02febbfe Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: 509a09653b am: d799e4332b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: I0e11cdd3dd74b46bcfc04d7cfa43391469aebf86
2021-05-28 03:03:09 +00:00
Beth Thibodeau
b7749fd405 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I93ad28321bdc880f9fda6c6299cb1b5b60d81cfa
2021-05-28 02:29:54 +00:00
Kevin Chyn
e6eb1020f8 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: I76b7fff784faa5945717c1ec3d016f7ab57d5ece
2021-05-28 02:29:24 +00:00
TreeHugger Robot
509a09653b Merge "Update battery defender tip string" into sc-dev am: 029edb7c48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Id714cf519433966edd608cb9f62b9d12b7e5d384
2021-05-28 02:24:48 +00:00
TreeHugger Robot
c4882fe250 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:56:30 +00:00
TreeHugger Robot
c2bc9bfc54 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-27 18:37:28 +00:00
Beth Thibodeau
8e67634830 Merge "Add recommendation setting and remove app settings" into sc-dev 2021-05-27 16:19:17 +00:00
Kevin Chyn
dc00faece6 Merge "Use lottie animation for fingerprint edu" into sc-dev 2021-05-27 08:31:55 +00:00
TreeHugger Robot
029edb7c48 Merge "Update battery defender tip string" into sc-dev 2021-05-27 05:52:19 +00:00
Curtis Belmonte
c3a2fe3ab9 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d am: 25b4e38015 am: 4bbe7beced
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: I0a35f5c08f89a73b440cfb7abc3f3b2adde39c76
2021-05-27 03:03:32 +00:00
Curtis Belmonte
25b4e38015 Merge "Fix crash due to traffic light face Lottie animation" into sc-dev am: 2c8745b58d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14738696

Change-Id: Ia9bec4a1e4d0fe47aa4232bb87c360f67f8ad560
2021-05-27 02:15:03 +00:00
Curtis Belmonte
2c8745b58d Merge "Fix crash due to traffic light face Lottie animation" into sc-dev 2021-05-27 01:55:58 +00:00
Bill Yi
ac8dae621e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I17b1b7d3f98301a5bae7823b6c6bfbf76af410e1
2021-05-26 23:32:27 +00:00
Bill Yi
07b7c39916 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I21a66b459321fbd9197255e41b8e29df59315941
2021-05-26 23:25:51 +00:00
Curtis Belmonte
adf0cabe0a Fix crash due to traffic light face Lottie animation
Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
2021-05-26 16:11:56 -07:00
Kevin Chyn
1bad80b36b Use lottie animation for fingerprint edu
The landscape layout can be removed now, since for UDFPS,
we do not use this page for the "find sensor" functionality anymore.
Instead, we show the edu animation.

Bug: 187460696
Test: manual

Change-Id: Ic2e15ecf73c42b8a0cea4ea8996b1b7dd2f3b4f2
2021-05-26 14:49:51 -07: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
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
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
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
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
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
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
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
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
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
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
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
Yanting Yang
c6feed297f Merge "Remove silky flag from Display for official release" into sc-dev am: d5aaf326e7 am: 97d6bac2f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716096

Change-Id: I854f59b936562153cdf5fc4a2dd1778454d4712b
2021-05-26 09:35:45 +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
Betty Chang
360cf8a97f Merge "Remove all the dividers in Wifi Settings" into sc-dev am: 3007bc21cb am: cf81b181ae am: f4ded72d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716097

Change-Id: Ifd13ac320188cb454420623c9ecad1c39073d25c
2021-05-26 09:19:57 +00:00
Yanting Yang
d5aaf326e7 Merge "Remove silky flag from Display for official release" into sc-dev 2021-05-26 08:35:32 +00:00