Commit Graph

83197 Commits

Author SHA1 Message Date
Curtis Belmonte
05c3b6479d 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: If63cb21eb6f5276d97996c0b7a588480f143e611
2021-05-27 02:15:15 +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
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
TreeHugger Robot
b5f586fbd4 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: I78269f4d650cda6b9915d9770976d7d42ae28e10
2021-05-26 18:49:48 +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
f75178c3da 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: I970d50e0ec513d509623714fa78cfdc74c8e41bd
2021-05-26 17:42:52 +00:00
Abel Tesfaye
e07f2977c6 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: I5f3f0516bc25131ff9b0977d77be728adee22d2c
2021-05-26 17:42:21 +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
b4080f53b2 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: Iff2b99e0c0c814f86d57c2fd3b3238f4e5dd1ac2
2021-05-26 17:05:15 +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
TreeHugger Robot
53380de2b7 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: I190485fad8b70958a7ff13859083e3b27a7bd152
2021-05-26 12:53:15 +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
8817016052 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: I1f97dae0b10628627e22f65e64f1f40cd3167ce4
2021-05-26 12:03:57 +00:00
Weng Su
ceae441ee0 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: I0cde659d3eb6fcba9d8a03bcf98755c7b6783168
2021-05-26 12:03:49 +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
8130ce29d8 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: I6b5a9baded2c249f7210cffd70a79bc2858fe864
2021-05-26 10:54:17 +00:00
TreeHugger Robot
5b24943b06 Merge "Simplify the transition logic." into sc-dev 2021-05-26 10:45:41 +00:00
TreeHugger Robot
f57eb3355e 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: Ie8cb5c0b893ee9d5bbcd92fdedd44683cfa4a700
2021-05-26 10:44:19 +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
eede4606b3 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: I8484f968794db7b3768f574ccea7f7bac2292c5e
2021-05-26 09:27:29 +00:00
TreeHugger Robot
b6be5003fb 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: I4b230f084a21397f8de615640e139275281864fb
2021-05-26 09:27:23 +00: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
Yanting Yang
14b290d8cd 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: Iad664c17ba29475135ffe2d752c92c2aee758a54
2021-05-26 09:19:58 +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
Betty Chang
f263fdc708 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: I9ee8a1aa234fbac384613f8982758ff72397a0a6
2021-05-26 08:12:24 +00:00
Betty Chang
3007bc21cb Merge "Remove all the dividers in Wifi Settings" into sc-dev 2021-05-26 07:54:28 +00:00
Yi-Ling Chuang
8871134dcd Simplify the transition logic.
- Only override startAcitivtyForResult() as other methods will also fall
to that one.

Bug: 187542491
Test: rebuild and navigate through pages
Change-Id: I2d5cf0c3deaa858d44c4330600e88b0f33ce0594
2021-05-26 15:51:02 +08:00
Patty
c491216243 Fix pairing dialog doesn't show the correct pairing key.
When the pairing dialog doesn't show in the foreground at the first time, the pairing key will display incorrectly.
This is caused by the intent doesn't contain the parameter BluetoothDevice.EXTRA_PAIRING_KEY.

Correct the pairing key by passing the pairing key to intent pairingDialogIntent.

Tag: #stability
Bug: 188614067
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingServiceTest
Change-Id: I3c91bf6ea51fa3fb77b4c4a5c17555606160603e
2021-05-26 15:46:00 +08:00
YUKAI HUNG
e745ca81ea 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: I70ebf49cb8af267e956626a8be9c15c676e4980b
2021-05-26 07:33:47 +00:00
ykhung
46bcdda9b9 Disable app usage item if this item is not clickable
some items are not clickable to launch the restriction page in the
battery usage list, we will apply the disabled visual in the
preferrence item to improve the UX (avoid users click the item without
any action)

Bug: 188751551
Bug: 188663505
Test: make SettingsgRoboTests
Change-Id: Ib8925b8e191117543bb1c74d6d01191e3043fc73
2021-05-26 07:27:01 +00:00
YUKAI HUNG
f49190d769 Merge "Refine consumed battery value formula for power component" into sc-dev 2021-05-26 07:26:20 +00:00
Jason Chiu
ff5219c7c2 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: I89ccbbd0dfa488d0f98903862ef9334f1814a684
2021-05-26 07:19:10 +00:00
Wesley Wang
6693d44065 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: Ibbf8880055e52e6a3bbd15c9dc218fcae54ff762
2021-05-26 07:18:37 +00:00
Jason Chiu
a1b818a8d8 Merge "Add icon declaration in metadata for injected activities" into sc-dev 2021-05-26 07:11:05 +00:00
Wesley Wang
a967b88ee4 Merge "Add new battery entry into AppInfo page launch variable" into sc-dev 2021-05-26 06:59:13 +00:00
Sunny Shao
e0c921a8fa Fix the extra speaking in Allow supervision dialog
- Extra speaking the  "double tap to activate" when focus
  "Family Link manage ...".
- Root cause: this Textview set the setMovementMethod method.
- Solution: Remove this setMovementMethod because it is usless in here.

Bug: 187968203
Test: manual test
Change-Id: Ia3f277f6814cb009f0e07f56381e3e46fbacc7a8
2021-05-26 14:53:14 +08:00
Yanting Yang
be97cbc94b 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: I7cd39f3d735463f742702a85dbe1671db4b95105
2021-05-26 06:32:15 +00:00
Yanting Yang
c2ac66cadc Remove silky flag from Display for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: I139f1dbc1ca030ccb0b778c479e0b23289c1c282
2021-05-26 14:25:43 +08:00
Yanting Yang
4fce42c454 Merge "Correct breadcrumbs of Wallpaper & style" into sc-dev 2021-05-26 06:20:38 +00:00
TreeHugger Robot
07a02ebbe9 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: I4a60e31b7ff70c3576c366481333c2a15f44f6de
2021-05-26 04:07:45 +00:00
TreeHugger Robot
f6d0845783 Merge "Tweak right padding for multiple preferences" into sc-dev 2021-05-26 03:36:54 +00:00
changbetty
3f6bccc87c Remove all the dividers in Wifi Settings
Bug: 189049289
Test: manual test
Change-Id: Ib2b884e36837bf9cc30c6af554c774bda8e7322b
2021-05-26 11:19:03 +08:00
Yanting Yang
4438528980 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: Ia05c2275f2f7a2220088d038407860452082d423
2021-05-26 02:25:58 +00:00