Commit Graph

2054 Commits

Author SHA1 Message Date
TreeHugger Robot
e837096e38 Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533

Change-Id: I87216a56ee6cd70ccf6af2318ccafec50642161a
2021-11-17 09:15:06 +00:00
TreeHugger Robot
0d96dc50b5 Merge "Fix the CtsVerifier issue" into sc-v2-dev 2021-11-17 08:58:43 +00:00
SongFerng Wang
df8cc34945 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258

Change-Id: Iea2dd1448309721f3a57cba3c8c04a0dbae6b4a5
2021-11-17 05:06:07 +00:00
SongFerng Wang
6b81329fc2 Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev 2021-11-17 04:56:04 +00:00
Jason Chiu
a6cd1fee05 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev am: c144f7bb89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234663

Change-Id: I95ab4ae7fa4c8217d8dfef8ae1a07976681815ee
2021-11-16 07:40:47 +00:00
Jason Chiu
c144f7bb89 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev 2021-11-16 07:28:32 +00:00
SongFerngWang
13aadad7fa Device do network scan after user rotates NetworkSelection page
To avoid to do oncreate when device is rotated or the screenSize
changed. Adding the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize". (Based on SettingsHomepageActivity's settings
and the smallestScreenSize is for screensize changed on
different display.)

Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)

Change-Id: I6aa009fc52a85024a29bf48a3e7d1aadcab067d8
2021-11-15 12:46:34 +08:00
Weng Su
eb70b243f7 Fix the CtsVerifier issue
- The "android.settings.WIFI_SETTINGS" intent-filter needs to be the
first element of the intent-filter in the activity for profile intent
filters

- Redirect the "android.settings.WIFI_SETTINGS" action to Internet
Settings via FRAGMENT_CLASS meta-data

- Add PRIMARY_PROFILE_CONTROLLED meta-data to WifiSettings2Activity

- Remove unnecessary WifiSettings2Activity from Settings.java

Bug: 205258444
Test: manual test
- Long press the Internet Tile in QS for WIFI_SETTINGS action testing
- Use adb command to test the shortcut action
adb shell am start com.android.settings/.Settings\\\$WifiSettings2Activity

Change-Id: I9ac397828edf1083efcf790eb41b3e978ed6bdca
2021-11-12 15:06:05 +00:00
Zoey Chen
2d5641f17b [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size am: 6cf16b0aa9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145006

Change-Id: Idea7f177ee4897c20bd7faf773a34e79976f2376
2021-11-12 08:43:51 +00:00
Zoey Chen
6cf16b0aa9 [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size
2. register split rule for MobileNetworkActivity

Bug: 204508876
Test: manual
Change-Id: Iff3dae41293e79b274d2928cb51efea46fb45dd4
2021-11-12 15:22:43 +08:00
Jason Chiu
3af73364ba Support highlighting the menu entry for Search results
1. Add a receiver to monitor the search state
2. Shoe/hide the menu highlight in the listener
3. Highlight the menu entry in SearchResultTrampoline
4. Enable/disable the receiver in SettingsInitialize

Bug: 205781792
Test: manual, robotest
Change-Id: Ia04901f504172f4f0c7b4b2ea7eda5f3713f676d
2021-11-11 14:33:26 +08:00
Jason Chiu
7b64761bd2 Support Settings deep links highlighting the menu entries
Bug: 203492419
Test: visual
Change-Id: I2249d4779d69bc0934b9c57900b903638ad6700b
Merged-In: I2249d4779d69bc0934b9c57900b903638ad6700b
2021-11-11 02:29:54 +00:00
Jason Chiu
a3ad3d1abb Support Settings deep links highlighting the menu entries
Fix: 203492419
Test: visual
Change-Id: I2249d4779d69bc0934b9c57900b903638ad6700b
Merged-In: I2249d4779d69bc0934b9c57900b903638ad6700b
2021-11-10 09:09:26 +00:00
Treehugger Robot
9c564e9016 Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac am: f7836dd7bc am: bd105d62e0 am: 38f57dc3d7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I5df7284a5193b57cb18524a7ae9360fbe64cac26
2021-11-09 08:35:20 +00:00
Treehugger Robot
38f57dc3d7 Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac am: f7836dd7bc am: bd105d62e0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I2a2c8d7828b07e519ecb2736f9c1d5d0940fea24
2021-11-09 08:18:41 +00:00
Treehugger Robot
bd105d62e0 Merge "Add entry point for adaptive brightness settings" am: d3d24b65ac am: f7836dd7bc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1698500

Change-Id: I50db46670b28fe29d5f5c3911ea09fd5b99f1c9d
2021-11-09 08:00:04 +00:00
Jun Ono
89c2c5e9c0 Add entry point for adaptive brightness settings
Test: adb shell am start -a android.settings.ADAPTIVE_BRIGHTNESS_SETTINGS
Bug: 187332145
Change-Id: Ifd81bfb3b0abc3ea10a062cb49fab20f6ef3fdfc
2021-11-05 17:27:41 +00:00
TreeHugger Robot
5f87b783af Merge "Fine tune the homepage scrolling behavior" into sc-v2-dev am: 244df10d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182700

Change-Id: Ic2903d78e94cdf49d655b51ce84be85be9a4d634
2021-11-05 11:37:13 +00:00
Jason Chiu
ae5327d4bb Fine tune the homepage scrolling behavior
Scroll to the highlight position before showing homepage.

Bug: 199017944
Bug: 204946469
Test: visual
Change-Id: I11708f42180a3af22855ac7b5f53460f737ed208
2021-11-05 18:21:59 +08:00
Tom Hsu
acfbe351eb Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev am: 0ad93a95c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174733

Change-Id: I1ba69fa41b9781be762c45577b6a44546ac4e409
2021-11-03 07:32:45 +00:00
Tom Hsu
0ad93a95c6 Merge "[Settings] Avoid crash from rotation screen." into sc-v2-dev 2021-11-03 07:15:24 +00:00
TreeHugger Robot
edc39b86fc Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210

Change-Id: Ie4cd9c0a1d93bf325356c7538e891a815c6a2edf
2021-11-02 22:45:10 +00:00
TreeHugger Robot
2fa408c103 Merge "Add intent action to launch face enrollment" into sc-v2-dev 2021-11-02 22:32:27 +00:00
Curtis Belmonte
3de8abe8ee Add intent action to launch face enrollment
Test: adb shell am start -a android.settings.FACE_ENROLL

Bug: 204100385
Change-Id: I3ac4395d80f0c36e8cab3b068c51ce03d0ecad7b
2021-11-02 14:18:11 -07:00
tom hsu
e53d70babc [Settings] Avoid crash from rotation screen.
Bug: b/200822579
Test: Local test

Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
2021-11-02 12:36:49 +00:00
Jason Chiu
6230bf1f1c Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev am: e1ec69fa1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15926633

Change-Id: I2b407cb2d53996f9432e6770ce586358e5c44b7d
2021-11-01 02:23:26 +00:00
Jason Chiu
e1ec69fa1a Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev 2021-11-01 02:10:21 +00:00
Arc Wang
a63e9c625d [Large screen] Make slice deep linking to Settings show in 2-pane
- add a standalone home activity for slice deep link.
- add EXTRA_IS_FROM_SLICE to control the slice deep link flow.
- Intent#parseUri fails if the intent data schema is set.
  Add EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA to relay the
  data schema.

Bug: 201397123
Test: manual, robotest
      1.  Say 'Enable NFC'/'Enable Bluetooth'to Google assistant.
      2.  Click the the NFC/BT Slice.
Change-Id: Ia3216956328c32b2109cb2d70ad1105327661f26
2021-10-31 20:12:27 +08:00
Weng Su
e739b3c99b Keep compatibility for old WiFi shortcut
- WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in R, update to S and test it
Bug: 199033769
Change-Id: I735106578cd11a15ffef1fd4d8e9703ae781db6c
Merged-In: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-28 07:27:06 +00:00
TreeHugger Robot
7272c9d036 Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944

Change-Id: Icbecef23b576b84f0d1a30fe8c294e81a1f12a45
2021-10-28 00:49:08 +00:00
Weng Su
3b99a81e78 Move android.settings.WIFI_SETTINGS action to Internet Settings
- Starting from S, the WiFi Settings is changed to Internet Settings

- Redirect to WiFi Settings if Provider Model disabled

- Don't use FLAG_ACTIVITY_NEW_TASK to avoid Lock Task Mode impacted

Bug: 199364761
Bug: 198740257
Bug: 203191404
Test: manual verified by TestDPC apk (see b/198740257#comment41)
Change-Id: I3c283ef58b37f4d3fe27045f431932a35af55023
2021-10-26 03:39:13 +00:00
Weng Su
e155a7b61d Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 am: 76e3973684
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Ic5115a90c11784019c2be7b1ef7c8a47de02e846
2021-10-21 13:37:59 +00:00
Weng Su
76e3973684 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Ifc9692777cd4e99ee358a4599317b69a619745ac
2021-10-21 13:20:13 +00:00
Weng Su
8cf3250517 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-21 13:10:56 +00:00
Arc Wang
499d8b26bd Merge "Improve scalability of Settings deep link API" into sc-v2-dev 2021-10-19 03:56:28 +00:00
TreeHugger Robot
574d925590 Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550

Change-Id: I3c768c5e2f820b326e3605fb54ebaf46c723b943
2021-10-14 17:07:35 +00:00
Weng Su
9e6966d1c2 Add WIFI_SCANNING_SETTINGS action to Settings
- Export the interface for System UI to launch Wi-Fi Scanning Settings.

Bug: 202323013
Test: manual test by adb to launch Wi-Fi scanning settings below
adb shell am start -a android.settings.WIFI_SCANNING_SETTINGS

Change-Id: I893d3cea40d1f3ed4a962009416f54c99a91e11f
2021-10-13 15:17:19 +00:00
Arc Wang
8b2dd65738 Improve scalability of Settings deep link API
Avoid using 'two pane' and 'large screen' because
they are implementation details exposure.

Bug: 201662312
Test: build pass
Change-Id: Id3555f734ff11e31d2f4db0479331c4f27e9e715
2021-10-12 21:31:54 +08:00
Jason Chiu
29a09e55ba Revert "Revert "Support highlightable Settings homepage menu for 2-pane""
This reverts commit 096c090b80.

Reason for revert: crash is fixed in this change

Bug: 202510128
Test: manual, build
Change-Id: Ifff8d58cfdcf43e123b11dee308665b2617cb4b3
2021-10-12 09:32:07 +00:00
David Magno
6031a6ef69 Keep compatibility for old WiFi shortcut
WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
2021-10-11 18:26:09 +02:00
Greg Kaiser
1ab7ad3e40 Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev 2021-10-08 14:48:14 +00:00
Greg Kaiser
096c090b80 Revert "Support highlightable Settings homepage menu for 2-pane"
This reverts commit 9037ceabd3.

Reason for revert: Presumed cause of b/202510128

Change-Id: I0daaab95d9bc57229c0c8c916cbe3ada7aafb6fa
2021-10-08 14:29:06 +00:00
Jason Chiu
9b1f593773 Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev 2021-10-08 07:52:45 +00:00
Jason Chiu
9037ceabd3 Support highlightable Settings homepage menu for 2-pane
1. Add a preference group adapter to perform highlighting
2. Add a class for mapping highlighable menu keys and preference keys
3. Add an API to determine if the screen is in split mode

Bug: 199017944
Test: manual, build
Change-Id: I8e3fe5fb96480a31ee0f3b3afb6ad78999d3d2bc
2021-10-08 12:52:52 +08:00
TreeHugger Robot
050872ecf0 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e am: 818a481294
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I2ef15e8417597360acf885ad323b39db9961b35f
2021-10-06 21:03:13 +00:00
TreeHugger Robot
818a481294 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-dev am: 1a049e065e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994986

Change-Id: I4473dbc8e67fe8dd4f3eb574d021062efc1b975e
2021-10-06 20:53:55 +00:00
Chen Chen
ee0f42ec6c BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:55:19 +00:00
Chen Chen
2b7a6c4407 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:54:38 +00:00
Chen Chen
e5ccfba996 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:44 +00:00
Weng Su
fb7d6f3918 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev 2021-10-06 18:48:54 +00:00