Commit Graph

2035 Commits

Author SHA1 Message Date
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
Jason Chiu
93494cd39b Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev 2021-10-06 06:29:46 +00:00
Sunny Shao
f9beef43c9 Update font/display size pages for support large screen in SuW
- Follow the SuW design of the UI guideline.
- Add the footer button for each pages.
- Add a new AccessibilityScreenSizeForSetupWizardActivity for SuW.
- Add suw_font_size_fragment.xml and suw_screen_zoom_fragment.xml
  for each fragment.
- Shorten 50% of the preview height.

Bug: 194447311
Fixes: 199369859
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I2685e96d37d542490521ec24cfce490f87cbd88d
2021-10-06 11:41:57 +08:00
Weng Su
e92d1d1a6b [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-05 12:03:07 +00:00
Jason Chiu
73fa1f8e06 Create a provider for querying if embedding activity is enabled
Bug: 202103027
Test: manual
Change-Id: I97bd5fc9d1d6157ff11096678217f44175df0c8d
2021-10-05 17:25:52 +08:00
Weng Su
1c93d29b73 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit fa1e3870d8.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I77a027075465b5685a857b4c8c68203ef812a172
2021-10-05 03:25:13 +00:00
Weng Su
5cbaa375cd [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-04 07:36:06 +00:00
Weng Su
f9e7a17247 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-01 15:00:12 +00:00
Arc Wang
94a4bd82ba Ues permission to protect DeepLinkHomepageActivity
DeepLinkHomepageActivity needs the permission
android.permission.LAUNCH_TWO_PANE_SETTINGS_DEEP_LINK
to limit the apps that can show Activity in Settings 2-pane.

The permission is of protectionLevel signature|preinstalled.
System grants the permission automatically to all the
preinstalled apps and the apps that signed with platform key.

Bug: 197048599
Test: build pass
Change-Id: I1c2de3c9cddae432c5ff6e5d6ad56959b8117f8b
2021-09-24 03:24:14 +00:00
TreeHugger Robot
6b5973c48e Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410

Change-Id: Ia5440a9db8bf15ced28fcca5de37e2a086cba41a
2021-09-22 09:22:02 +00:00
Joshua Duong
c960e8973a Fix QR code scanner layout in "Pair devices over Wi-Fi" page.
The toolbar needs to be disabled to remove the empty space at the top
of the page. Also added the landscape layout xml.

Bug: 193602141
Test: atest SettingsUnitTests and manual

Change-Id: I30368835979b360a8f09e16f70adf57064784517
(cherry picked from commit fd009229e5)
2021-09-17 15:36:32 +00:00
Arc Wang
fdfac783ab Add android:configChanges for SettingsHomepageActivity
When resuming Settings app of large screen devices,
SettingsHomepageActivity will be re-created for
Activity resized. It produces unnecessary Activity
destroy and re-create.

This change prevents SettingsHomepageActivity from
configuration changes for screenSize|screenLayout.

Bug: 198361315
Test: manual
      1. Launch Settings app by a Settings shortcut widget.
      2. Move Settings app to background.
      3. Click Settings shortcut widget again.
         Observe if SettingsHomepageActivity re-creates.
Change-Id: I4d71330f6a1760768ba4443e192f66b0a2cbb6bf
2021-09-15 12:13:58 +08:00
Arc Wang
22ce392b91 2 panes deep link for large screen devices
This change supports deep link to Settings app internal pages
and external pages outside Settings app.

Apps need android.permission.ALLOW_TWO_PANES_DEEP_LINK_IN_SETTINGS
to send the intent of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
Settings app will startActivity for the intent from
Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI.

Bug: 197048599
Test: build pass
Change-Id: Idaf4a8be4603c1308f16fb4e378266c1e52acb40
2021-09-09 13:04:31 +08:00
Tsung-Mao Fang
4781fc1687 Revert "Revert "Support two pane design in the Settings app.""
This reverts commit 07037dbc3f.

Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>

Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963
2021-09-06 02:41:26 +00:00
Tsung-Mao Fang
07037dbc3f Revert "Support two pane design in the Settings app."
This reverts commit a12a0d1eb2.

Reason for revert:  See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug

Bug: 198722766
Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c
2021-09-03 17:12:47 +00:00
TreeHugger Robot
9e1b5fb825 Merge "Support two pane design in the Settings app." into sc-v2-dev 2021-09-03 02:26:58 +00:00
Tsung-Mao Fang
a12a0d1eb2 Support two pane design in the Settings app.
1. Only enable this feature when the flag is on and library is supported
in this device.
2. Add a placeholder rule for home menu.
Network page will be shown to the right pane by default.
3. Add a rule for most sub settings pages.

Known issues:
1. Transition animation seems wrong in this cl.
2. App is closed if user taps back key on the second layer page in fold
state.

Test: Run the apk on large screen device and regular phone. No crash
happens
Bug: 197716926

Change-Id: I089717e84c5e92c6e5b02d9770a24376e250fea2
2021-09-02 13:57:42 +00:00
Weng Su
29f4a35dea [RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
2021-08-26 04:24:39 +00:00
Zoey Chen
2a87acf247 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev 2021-08-25 06:04:30 +00:00
TreeHugger Robot
a1b8347ae4 Merge "Import the window extension libary in the Settings app" into sc-v2-dev 2021-08-24 05:19:07 +00:00