Commit Graph

2006 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Tsung-Mao Fang
c6e44c0e89 Import the window extension libary in the Settings app
Test: Rebuilt apk and run apk successfully.
Fix: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
Merged-In: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
2021-08-24 12:01:35 +08:00
TreeHugger Robot
a327c5bad7 Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: If32d2dcc40d134c20560aa43da7c276afc9520a9
2021-08-23 16:28:07 +00:00
Weng Su
c7c7a813fb [Provider Model] Correct the Settings shortcut of the Settings Widget
The Settings is used the "Internet" settings instead of "Wi-Fi" settings
after Provider Model enabled.

The Settings shortcut of the Settings widget should update below.
  - Remove "Wi-Fi" shortcut from the Settings widget
  - Correct the "Network & internet" shortcut to "Internet"

Bug: 194644851
Test: manual test
  atest -c SettingsUnitTests
  make RunSettingsRoboTests
Change-Id: I488327a01f5e539ecbe315b7016f65084dfd59a1
Merged-In: I488327a01f5e539ecbe315b7016f65084dfd59a1
(cherry picked from commit 658a417205)
2021-08-18 07:45:55 +00:00
menghanli
5af9c64110 [Material Next] Accessibility gesture tutorial dialog
Problem: The dialog does not follow the Material Next guideline
Proposal:
1. Apply the dynamic color by removing SettingsTutorialDialogWrapperActivity which set extra theme
2. Hanlde the recreate case if shows the dialog directly
3. Update new Illustration in Pixel Lottie asset

Bug: 195980595
Test: Manual test
Change-Id: Ib6267128bbe5522ac8720c15fc2720c9a78f8671
2021-08-18 11:22:08 +08:00
Weng Su
1fe8220afa 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)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
2021-08-17 08:14:55 +00:00
Julia Reynolds
1129429a7c Fix launch flags for channel panel
To fix the interaction with the sound picker

Test: launch sound picker from panel, ensure result saved
Test: launch sound picker from panel, cancel
Test: launch more than one panel, make sure all can be edited
Test: change sound from full channel settings page

Fixes: 195739942
Change-Id: I9df86507f8f0cfdd1b0935ca9fe056d24b6d6eac
2021-08-09 00:55:39 +00:00
Weng Su
56a88885cc Add comment to AndroidManifest
- Wi-Fi result data will only be returned from WifiDialogActivity if the
calling package has location permission.

Test: add comment only, no test required.
Bug: 185126813
Change-Id: I81c4d801c4ee211f43a1688a62daaff3b47eae1a
2021-07-06 11:30:17 +08:00
Alex Johnston
713d325310 Merge "Remove credential management app Settings" into sc-dev 2021-07-02 11:05:49 +00:00
Mill Chen
aaa031bd71 Correct the choose screen lock page
The choose screen lock page didn't apply the right theme during the
enterprise flow. That is because an intent extra of setup wizard wasn't
properly passed to the next page. In this change we made sure the intent
extra is able to properly pass to the next page.

We also removed the wrong theme for setup choose a screen lock page
since the wrong theme made this page broken. The setup choose a screen
lock is a sub setting page that wasn't implemented by using SUW library,
so it should not use GlifLayout theme. With this update, the choose a
screen lock page still keeps the background color of Settings, that is
different from the one of setup flow.

Bug: 190499041
Test: manual test
Change-Id: I9dceee6a398c7e7b487dd8e4046f71f76cc50e36
2021-07-01 16:54:00 +08:00
Alex Johnston
8d06d63fe3 Remove credential management app Settings
* Update string and icon
* Flip icon if languate is RTL e.g. Arabic
* Add dialog when 'Remove app' is selected
* Add Material Next theme to dialog
* Update string terminology when removing a
  CA or user certificate to from 'remove'
  to 'uninstall'
* Final UI tweaks to RequestManageCredentials screen

Screenshots
* Light mode: https://screenshot.googleplex.com/66QKFLhtn6ZueZQ
* Dark mode: https://screenshot.googleplex.com/9kkTaaDV6CiHudF
* RTL: https://screenshot.googleplex.com/AkwSibXakARYM8H
* Request light mode: https://screenshot.googleplex.com/6n6raBQ8drXRHcU
* Request dark mode: https://screenshot.googleplex.com/3bmWNoTwE6JBqAX

Bug: 189416800
Test: atest CredentialManagementAppButtonsControllerTest
      manual testing with TestDPC
Change-Id: I5450d33603418930e92b03c4447aaa1095afe9a3
2021-06-30 13:53:58 +00:00
Tsung-Mao Fang
efaf49c19d Fix crash on notifcations/device admin add pages
Do not apply window action bar in collasping tool bar activity.

Fix: 192291587
Test: Go through most pages in Settings app.
Change-Id: I4eafb92b67cd3a9e08d04e4aae007aa473f810dd
2021-06-29 14:40:31 +08:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Jeff Sharkey
5b7518fdf7 Merge "Update to modern Bluetooth permissions." into sc-dev 2021-06-24 14:44:28 +00:00
Jeff Sharkey
7025a83f39 Update to modern Bluetooth permissions.
The Settings app offers several Bluetooth intents, and they need to
be updated to enforce the new "Nearby devices" runtime permission
model, since the old BLUETOOTH and BLUETOOTH_ADMIN permissions have
been deprecated.

Bug: 191174082
Test: TH
Change-Id: I0d812f486bc3dadc517d5b04d3082d4f56f60ef4
2021-06-23 08:53:05 -06:00
Tsung-Mao Fang
df00a3bc69 Consistent color between status bar and app bar
In Android S, we add the transparent color to navigation bar
and status bar for consistent color between status bar and
app bar. So, we should add this change for oveall setting
theme since most pages should apply new app bar now.

Thus, we don't need to override the subsetting style for different
activities one by one.

Homepage doesn't have new Android S tool bar, so we shouldn't adopt it.

Test: Try to launch all the pages as many as possible.
Fix: 190797935
Change-Id: Ic4083de5477371f1d0eea2d66f020e4469fa3f86
2021-06-23 17:53:59 +08:00
Joe Bolinger
fb515ed608 Add handoff activity to parental consent flow.
Bug: 188847063
Test: manual
Change-Id: Ib6f38aae487a536fb8e85d608a22378a17c1bc64
2021-06-18 10:35:35 -07:00
Joe Bolinger
a8808f7368 Add plumbing and placeholder screens for parental consent flow.
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest
Change-Id: Ie136036d5f550775fd0b021979581a5d222f1b68
2021-06-16 09:58:19 -07:00
Peter Wang
5a6655d356 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev 2021-06-14 17:58:40 +00:00
Peter Wang
8abc64b7f7 Fix ToggleSubscriptionDialogActivity dialog theme.
Bug: 185415478
Test: Local
Change-Id: Ice4c826bb2ecc5dacc7a54c2840a0d5f83d5757c
2021-06-11 11:55:37 -07:00
TreeHugger Robot
efd1c870f2 Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev 2021-06-11 09:50:43 +00:00
Yanting Yang
1e2f161950 Correct the app bar color theme of Digital Assistant app
Fixes: 190450049
Test: visual
Change-Id: Ib3ff19bd8a00060400960fd92060ac7b136fd3d5
2021-06-09 17:20:14 +08:00
Mill Chen
101823e602 Update the theme to fix background color problem
The action bar in the some setting pages has different background colors
when the action bar is in collapsed mode. These pages are using the default
settings theme that doesn't include edge-to-edge setting. This can be
fixed by assigning SubSettings theme to this activity.

Fix: 189189879
Fix: 188110157
Test: visual verified
Change-Id: Ie8d9b4c950e6a8ab5a7e361f94b8587d854b3b70
2021-06-07 17:32:11 +08:00
TreeHugger Robot
88346ce71c Merge "Update Policy transparency dialog layout" into sc-dev 2021-05-31 02:29:53 +00:00
Sunny Shao
ccd292083d Fix the color problem at top/bottom border when page transition
Fixes: 183361867
Test: manual test
Change-Id: Ia1b418adaeacd68fa6904ace8a0b2818c2d9d9be
2021-05-27 13:50:23 +08:00
Edgar Wang
83507b5f33 Update Policy transparency dialog layout
- Update icon
- Fix color didn't apply dark theme.

Bug: 188756125
Bug: 189167991
Test: manual
Change-Id: Ie975c8999efe352fc9485d936a065d33e5ca76b1
2021-05-27 13:03:44 +08:00
Jason Chiu
a1b818a8d8 Merge "Add icon declaration in metadata for injected activities" into sc-dev 2021-05-26 07:11:05 +00:00
Jason Chiu
5f0fc1ff91 Add icon declaration in metadata for injected activities
Settings injection no longer supports auto-load the component icon when
metadata doesn't contain icon and icon_uri.

Copy the icon resource from the activity to metadata.

Bug: 186801104
Test: visual
Change-Id: I3a90bbb5e27eb0f4491d57b1412b14a326fca0a7
2021-05-25 11:08:59 +00:00