Commit Graph

2055 Commits

Author SHA1 Message Date
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
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
6ed6c30067 Merge "Support two pane design in the Settings app." into sc-v2-dev am: 9e1b5fb825 am: c2fff38feb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15674256

Change-Id: Ica30fd1745fe7d08661493251b11b3fae92d34e7
2021-09-03 02:49:08 +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
Joshua Duong
12f0a063ac Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." 2021-08-25 15:35:56 +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
Menghan Li
45d410ed91 Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4 am: 2fa8b94643
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15501580

Change-Id: I275ea531be18bc1b0aa3fe372f59f89e4d4590ba
2021-08-20 22:10:23 +00:00
Tsung-Mao Fang
18ad0c49a8 Import the window extension libary in the Settings app
Test: Rebuilt apk and run apk successfully.
Bug: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
2021-08-19 17:23:11 +08: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
Joshua Duong
fd009229e5 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
2021-08-12 18:44:15 +00:00
TreeHugger Robot
a16b814ed1 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 7b6c01cf2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I7b55e38ebdf19f108241fee08f161379b34f0f94
2021-08-09 13:01:10 +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
alinasuarez
aef6ac2889 Alarm Manager policy TARE page implementation
An alarm manager policy page is needed in the TARE developer option
settings to allow developers to both view and edit the current values of
all the factors under the alarm manager policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors will pop up under it.

Bug: 191876714
Bug: 191876567

Test: Manual (open Settings > System > Developer Options > TARE > Alarm
Manger and verify all factors are there)

Change-Id: Ie036e26df80947d23041bedfd5b1385e48069b6b
2021-08-02 17:39:36 +00:00
Weng Su
658a417205 [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
2021-07-26 16:33:31 +08:00
TreeHugger Robot
7ca5f9d9e1 Merge "Add TARE button and homepage to developer options." 2021-07-22 22:21:42 +00:00
alinasuarez
6ffa9dad04 Add TARE button and homepage to developer options.
A TARE button is needed in the developer options in settings to allow
users and developers to change the default settings it will come with.
When clicked, it opens an activity of the TARE homepage with a toggle
and the two policies (Alarm Manager and Job Scheduler) to choose between. It also contains a revert to default settings button.

Bug: 191876567

Test: Manual (open Settings > System > Developer Options > TARE and
verify tabs and menus are there)

Change-Id: Id14bc9c1dcbaaf2aeb74ba7efb0168ab424f5d0c
2021-07-22 20:52:06 +00:00
Weng Su
e8a4e13a80 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
2021-07-19 09:29:33 +00:00
TreeHugger Robot
7c3cfdc97c Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433 am: 86928d4f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210536

Change-Id: Ic16163c62a2d6d48cb16399941067a4c34e8365a
2021-07-06 08:09:20 +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
f2efb8f97b Merge "Remove credential management app Settings" into sc-dev am: 713d325310 am: 1dc52643b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I121b749a7a911bc788ef9eb7263fc31335ce4146
2021-07-02 11:25:06 +00:00
Alex Johnston
713d325310 Merge "Remove credential management app Settings" into sc-dev 2021-07-02 11:05:49 +00:00
TreeHugger Robot
429d06a0cf Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26 am: 37f74d4aab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: Ie9f7fbf6de904e3002772c6e2cb004f1f9099035
2021-07-02 05:51:48 +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
TreeHugger Robot
88f06a3793 Merge "Fix crash on notifcations/device admin add pages" into sc-dev am: c24d5621de am: f1598b212c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109304

Change-Id: Id4478a6286fa28813f2f7cbaf24792a6cf9009c4
2021-06-29 08:09:12 +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
d1586a2619 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Iec6c485a15e053678d96b41c35ff8094289fc936
2021-06-28 04:47:38 +00: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
6a9a1b9e91 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I12ebf9bd8a635fb36207979dfc39c05aa34f2e4b
2021-06-24 15:17:59 +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
e0996aaada Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: 69291542a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: Ic4aeffad3ac3608d3666328838c23bfe71736233
2021-06-21 20:12:15 +00: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
483b89c575 Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d am: 30c3003696
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: If760363bf2408e2a8aceb6183242c14386f98e65
2021-06-18 17:03:47 +00: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
fa10eff411 Merge "Fix ToggleSubscriptionDialogActivity dialog theme." into sc-dev am: 5a6655d356 am: 43fe473265
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14941671

Change-Id: I4a45e5e98d8c59c4f3abcc114bdfbe8e3495920b
2021-06-14 18:23:55 +00: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
d0dd233feb Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev am: efd1c870f2 am: 3b04aa48a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14912508

Change-Id: I4fdf46b18e4687a71ec58c5a0c813b51445b9ebd
2021-06-11 10:18:52 +00: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
Mill Chen
3ceef75f46 Merge "Update the theme to fix background color problem" into sc-dev am: 6a1ff49cb7 am: b190fd9825
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14878872

Change-Id: Id66a4bd56c4889171b9345eff84dd0a3320334ca
2021-06-09 10:03:35 +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
132acb43aa Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c am: 3127f05be9 am: c3cc642534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: Ida67a4838be73176d792e9edae1f10610c29a1aa
2021-05-31 03:06:52 +00:00