Commit Graph

83328 Commits

Author SHA1 Message Date
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
changbetty
916bac8f2e Adding an option to install a certificate from the CA certificate menu
For CA ceritificate we only can install in Network Preferences > Advaned
> Install certificates. So we add the option for user to install when
you setup the wifi network. After you install the certificate, you can
see the certificate in your menu.

Bug: 176998563
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test

Change-Id: I532b12f9277c6a15c649907fa3711c807566c88e
2021-05-26 16:37:14 +08: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
Wesley.CW Wang
9cc091cbd7 Update battery defender tip string
Bug: 175662315
Test: m RunSettingsRoboTests
Change-Id: I064a538631d359b22982f9df6e550b489529b057
2021-05-26 15:37:02 +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
Yanting Yang
e37d837cb4 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: I166a92de35a885fa51b4349652843759b94d4e5d
2021-05-26 02:25:45 +00:00
Yanting Yang
c10cfff485 Merge "Remove silky flag from Apps for official release" into sc-dev 2021-05-26 02:09:19 +00:00
Yanting Yang
bf99c92463 Merge "Remove silky flag from App info for official release" into sc-dev 2021-05-26 02:06:48 +00:00
Kevin Han
4b34271f7d Ensure hibernation exemption toggle uses pre-S flag
For dogfood, we want hibernation to target apps that target pre-S. This
was done on the PermissionController side but the toggle in Settings
did not visually reflect this policy, confusing dogfood/teamfood
participants.

This updates the default toggle position to consider whether the pre-S
flag is on and then default to the "on" position for apps targeting
pre-S if the flag was on for the device.

Bug: 189260947
Test: atest HibernationSwitchPreferenceControllerTest
Test: manual
Change-Id: I9cd16e82e1eee4589cb17a356b6bf2e3297a8dd2
2021-05-25 18:52:19 -07:00
TreeHugger Robot
50932883a5 Merge "Apply setup wizard's transition on a11y pages" into sc-dev am: 32ea479cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14716190

Change-Id: I5fc16240f18e6fcbd829f87b480f02e2fa09ab38
2021-05-26 01:29:02 +00:00
TreeHugger Robot
32ea479cc9 Merge "Apply setup wizard's transition on a11y pages" into sc-dev 2021-05-26 01:13:14 +00:00
TreeHugger Robot
bf46c0f27b 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: Ice5365b63affb6c5711909d08c484fed29265cd2
2021-05-26 00:29:44 +00:00
TreeHugger Robot
fc2b6c7c1b Merge "Query storage size instead of calculate size of installed APP" into sc-dev am: 0eaf329a43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14554355

Change-Id: If503eea2265223e6b912495b9ea6c8b6aa6c50ea
2021-05-26 00:29:15 +00:00
TreeHugger Robot
a4fc228b55 Merge "Consolidate app notification setting prefs" into sc-dev 2021-05-26 00:19:26 +00:00
TreeHugger Robot
0eaf329a43 Merge "Query storage size instead of calculate size of installed APP" into sc-dev 2021-05-26 00:13:16 +00:00
Yanting Yang
6bf1c3675d Correct breadcrumbs of Wallpaper & style
Remove the sitemap connection between Display and Wallpaper & style,
since we already moved the Wallpaper & style to the homepage.

Bug: 182708819
Test: robotests & visual
Change-Id: Ia069be91177d8fef56248b5343c41a13ef8267a2
2021-05-26 05:43:53 +08:00
TreeHugger Robot
5a7a695233 Merge "Update custom zen settings "off" string" into sc-dev am: 547cac8d9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720432

Change-Id: Ida12b02f58f125998a8da5e516f0a8a4af57e489
2021-05-25 21:01:12 +00:00
TreeHugger Robot
547cac8d9a Merge "Update custom zen settings "off" string" into sc-dev 2021-05-25 20:46:46 +00:00
Felipe Leme
f84684eed6 Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev am: d51e6cb7a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14671084

Change-Id: I1f34ca49be348384ac6ae5436640e340a4a4f0a0
2021-05-25 19:27:53 +00:00
Felipe Leme
d51e6cb7a4 Merge "Refactored some ActionDisabledLearnMoreButtonLauncherImpl methods." into sc-dev 2021-05-25 19:13:18 +00:00
Abel Tesfaye
0465239d4a Update battery saver string and make r lowercase in Auto rotate
Bug: 188843414
Test: none
Change-Id: I449fbe3d67eafb9ccdcef7719abdeb31eeb69b3f
2021-05-25 19:07:30 +00:00
TreeHugger Robot
65c4379aa8 Merge "Apply sliding transition for lock screen" into sc-dev am: 9018434111
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702760

Change-Id: Ia2c9d9cb29fa2573c149588edd4252176edbf343
2021-05-25 18:48:37 +00:00
TreeHugger Robot
9018434111 Merge "Apply sliding transition for lock screen" into sc-dev 2021-05-25 18:35:13 +00:00
Beverly
06b1ba1d09 Update custom zen settings "off" string
zen_mode_sound_summary_off should only be used when describing the
number of schedules that are enabled (and requires a numeric parameter).
Instead, use the string "off" when a sound isn't enabled by a custom dnd
setting.

Fixes: 189120026
Test: manual
Change-Id: I8bc180353a61455b124801d14f0d319f49bb341c
2021-05-25 13:31:52 -04:00
Julia Reynolds
e81b8275a8 Consolidate app notification setting prefs
Test: manual
Fixes: 189201867
Change-Id: If5cc03e0bd2d4273cd842e097b99b15d1178f3dc
2021-05-25 11:57:06 -04:00