Commit Graph

2108 Commits

Author SHA1 Message Date
Weng Su
256ca716c0 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517 am: 76e3973684 am: e155a7b61d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I1cf85ca6c59ab6d6d20ca17d235aeabc5d300a9d
2021-10-21 13:47:47 +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
241f1a196d Merge "Improve scalability of Settings deep link API" into sc-v2-dev am: 499d8b26bd am: 4659f73cbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981710

Change-Id: Ia13cb302ed356158acbba7db5205757bbcf89a03
2021-10-19 04:28:19 +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
7f3d1f8182 Merge "Handle csip set member automatic pair in Setting" 2021-10-15 12:10:31 +00:00
Alice Kuo
ebea73e36b Handle csip set member automatic pair in Setting
Move the set member handle to setting. SystemUI and Setting have the
individual settingLib instance. If we trigger pairing inside settingLib,
the action would be called twice. SystemUI does not contain the concept
to handle the pair interaction. Setting would take the action to
createBond for CSIP automatically.

Bug: 201758444
Bug: 150670922
Test: Pair the coordinated set devices, and check the set member pairing
would be done automatically without the pairing dialog

Change-Id: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
2021-10-15 18:09:51 +08:00
TreeHugger Robot
3b57f4c725 Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de am: f9dcd96f2e am: f7ffefb956
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550

Change-Id: Ia72279d08752c9a8e6cf0d23b0d0d2c3ccda3025
2021-10-14 17:40:12 +00:00
TreeHugger Robot
f7ffefb956 Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev am: 28b7d115de am: f9dcd96f2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047550

Change-Id: I5aa0ed21d5ec7de5ba1bc370f76dec8ab70e28a9
2021-10-14 17:21:50 +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
e65d3ab1cc Revert "Revert "Support highlightable Settings homepage menu for 2-pane"" am: 29a09e55ba am: 235353a131
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16038013

Change-Id: I4c526a0854fbe64efb834bf993c1e461b7993cad
2021-10-12 11:12:26 +00: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
d659a5271b Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into sc-v2-dev am: 1ab7ad3e40 am: 3f638ebad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16017469

Change-Id: I8a3deba2be06113f781f399221a8463f5454ceee
2021-10-08 15:12:13 +00: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
630cbdc519 Merge "Support highlightable Settings homepage menu for 2-pane" into sc-v2-dev am: 9b1f593773 am: de33f1224b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785736

Change-Id: Ic375f9e19b1f6dbc6f70cedaa770c133fb96f652
2021-10-08 08:12:37 +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
039fb4c2a7 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" 2021-10-06 20:06:52 +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
b4fef16d94 Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev am: 93494cd39b am: 328c184c3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981705

Change-Id: I64efb38494d12028eb87771dd1b6b516a6f0f201
2021-10-06 07:00:38 +00:00
TreeHugger Robot
fe13cd070d Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev am: 9ade901dd7 am: 87895d0893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895175

Change-Id: Icb7de5c7fc4bd8f89f7ef04b0cd9e8eb36a1c882
2021-10-06 06:42:34 +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
Chen Chen
38101d5358 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 00:48:01 +00: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
TreeHugger Robot
7ca53ecfcd Merge "Ues permission to protect DeepLinkHomepageActivity" into sc-v2-dev am: 244e0f536b am: 209210b0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895171

Change-Id: I708e9829085f23a6a2dd2c0e93d69cec93679be8
2021-09-28 04:53:15 +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
da117f1dc9 Add android:configChanges for SettingsHomepageActivity am: fdfac783ab am: 0db7eacaae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777510

Change-Id: Id5f5dc401b899caf5c429282deb10374efd94a38
2021-09-15 10:52: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
97b9e963c9 Merge "2 panes deep link for large screen devices" into sc-v2-dev am: 93e8dff489 am: 7cc196afc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15726372

Change-Id: I8c62ed06fc97af02db8f0ddc6a8d332b51872f38
2021-09-09 07:13:03 +00: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
TreeHugger Robot
1a2d1017ec Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5 am: 6e55a559d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805

Change-Id: I37f62eb7d9c90adf05508587511bff547813e69c
2021-09-06 04:20:35 +00: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
Ember Rose
2ec042c722 Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev am: 3377f1c04e am: aa472315b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751404

Change-Id: Ic5c1cad46a16d48cf27f88e353cd3afc4b886604
2021-09-03 17:26:32 +00:00