Commit Graph

852 Commits

Author SHA1 Message Date
TreeHugger Robot
37cd69b941 Merge "Update TARE UI." into tm-dev am: 2164070f4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987400

Change-Id: I176dcf67f12f05cc2f2f7678908cd4f1692bf5ea
2022-02-24 02:08:01 +00:00
TreeHugger Robot
2164070f4a Merge "Update TARE UI." into tm-dev 2022-02-24 01:27:56 +00:00
TreeHugger Robot
e7d4525902 Merge "Reset all TARE constants." into tm-dev am: 42156e7ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16989250

Change-Id: I7a4bae895aeff3ea80baa655e4fa549ee84b4394
2022-02-23 23:12:32 +00:00
TreeHugger Robot
42156e7ba9 Merge "Reset all TARE constants." into tm-dev 2022-02-23 21:34:34 +00:00
TreeHugger Robot
c45a71140a Merge "Clean up code." into tm-dev am: 78d917cc14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987398

Change-Id: I590199eb3f2bb3d679899a1a13752a53d0cfce61
2022-02-23 21:32:42 +00:00
Kweku Adams
2d12b846d4 Update TARE UI.
1. Connect the UI and controller components so that users can make
   changes and the changes will be written to settings and properly read
   back.
2. Update string constants to reflect changes from TIP1.
3. Refactor components slightly to reduce duplicate code.
4. Hide unsupported factors for now. They'll be added back later.

Bug: 158300259
Test: Manually change factors and check settings constant via adb
Change-Id: I2b70e7013c4766ea50f1f013da582eca74015c6b
2022-02-23 21:20:25 +00:00
Kweku Adams
d672c4017d Switch from androidx to android. am: ba685c0be0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16987397

Change-Id: Iee69adeb08fa0f678689807a88d8dc4c3d9c5359
2022-02-23 20:49:50 +00:00
TreeHugger Robot
78d917cc14 Merge "Clean up code." into tm-dev 2022-02-23 19:16:39 +00:00
Kweku Adams
bc3304b6a2 Clean up code.
1. Create a method for duplicate code.
2. Address style/lint issues.
3. Properly parse settings constant string. The original iteration
   wouldn't reset values to their default if the constant string didn't
   have a value set.

Bug: 158300259
Test: manual
Change-Id: I994b872ba16f12c8e06ce85aedc526b84e5fa31b
2022-02-23 16:30:08 +00:00
Kweku Adams
ba685c0be0 Switch from androidx to android.
The rest of the TARE classes use pure Android Fragments and will have an
issue trying to create an androidx Fragment, so switch from using an
androidx Fragment to an android Fragment.

Bug: 158300259
Test: manual
Change-Id: I4c27198a66bd51b3822421116b46ae3d80d589ff
2022-02-23 16:04:45 +00:00
Kweku Adams
a6693df48d Reset all TARE constants.
Reset all TARE constants, not just the enabled status, when a user
clicks on "Reset to defaults."

Bug: 158300259
Test: manual
Change-Id: I5328c7790729e3358751e703271a6ffd386bb33f
2022-02-23 16:03:10 +00:00
Kweku Adams
3ad1c4a9c8 Simplifying settings string generation. am: 82b0e1ccdb am: e6f24f02fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16980814

Change-Id: I80e5e86952ce74d234cd3f366fbfc4bd7498b1d3
2022-02-22 21:57:26 +00:00
Kweku Adams
82b0e1ccdb Simplifying settings string generation.
Remove duplicate code for generating the settings constant strings, and
make sure not to write redundant data (setting a value to its default).

Bug: 158300259
Test: Android builds
Change-Id: Id79bae3685bfecb4858574ee38b67b2a554823fe
2022-02-22 18:52:35 +00:00
Kweku Adams
2a51b8bfe0 Update constant names.
Updating references based on changes for TIP1. This change is just to
keep things building properly. Updates to the UI and functionality will
be done separately.

Bug: 158300259
Test: Android builds
Change-Id: I3a50c028fe69a6180ae842d3117b5cdfd712e0fd
(cherry picked from commit b05665fa83)
2022-02-18 21:55:13 +00:00
Kweku Adams
5efc9469c9 Merge "Update constant names." 2022-02-18 21:54:16 +00:00
Tsung-Mao Fang
6cf62b0ce8 Merge "Rename back button to navigate up button" 2022-02-18 09:23:46 +00:00
Tsung-Mao Fang
692c47e153 Rename back button to navigate up button
A minor wording review.

Test: build pass
Bug: 219000314
Change-Id: I23bc580b193cc891b659514d13705db2c55b756a
2022-02-18 13:38:07 +08:00
Edgar Wang
74096fa66a Merge "Replace SettingsSpinner with Spinner" 2022-02-17 14:10:40 +00:00
Edgar Wang
fa5ab2e268 Replace SettingsSpinner with Spinner
Bug: 219610512
Test: manual
Change-Id: Ib8562a64299a6cb36f8225199f9432cb81e8e9f2
2022-02-17 02:16:27 +08:00
Kweku Adams
b05665fa83 Update constant names.
Updating references based on changes for TIP1. This change is just to
keep things building properly. Updates to the UI and functionality will
be done separately.

Bug: 158300259
Test: Android builds
Change-Id: I3a50c028fe69a6180ae842d3117b5cdfd712e0fd
2022-02-16 18:15:31 +00:00
Tsung-Mao Fang
2df79641cb Show/hide back button for 2nd page
By design, we want to show/hide back button for 2nd
layer page when it's in two pane mode.

Test: Manual test
Bug: 219000314
Change-Id: I14d8d7ee08280d5ce80c0b59e1e91d077f0b6d09
2022-02-16 18:01:42 +08:00
Etienne Ruffieux
0c2585b171 Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0 am: b97acda5cf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: Ib50f9c12070e411d1582615ebe59985046f05ecc
2022-02-07 22:13:52 +00:00
Etienne Ruffieux
b97acda5cf Merge "Removed mocked BluetoothAdapter" am: a6d4788fa0 am: d020a96da1 am: 28b1a9e4b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960844

Change-Id: Idc59b3f953adab7686e532d36c66b12d21df995c
2022-02-07 22:00:46 +00:00
Etienne Ruffieux
a6d4788fa0 Merge "Removed mocked BluetoothAdapter" 2022-02-07 21:17:41 +00:00
Etienne Ruffieux
55dff92a23 Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d am: 89b43fde97 am: e89d54c739
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: Iaa5af12751efa061229de1f2d255a48022d08940
2022-02-03 00:57:39 +00:00
Etienne Ruffieux
e89d54c739 Merge "Replacing getActiveDevice by btAdapter.getActiveDevices()" am: 7ff6347c57 am: 3ddfa01d4d am: 89b43fde97
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1966615

Change-Id: I666780f68471ba1235adc4a2f60e3a50ae5a868c
2022-02-03 00:36:45 +00:00
Etienne Ruffieux
9692c59d3a Replacing getActiveDevice by btAdapter.getActiveDevices()
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.

Tag: #feature
Bug: 200202780
Test: build
Change-Id: Id18658de82a7e8292942951a3832a36465a69da3
2022-02-02 15:29:34 +00:00
TreeHugger Robot
b27bad5154 Merge "Ask user to reboot when enabling freeform and desktop mode" 2022-01-27 22:55:30 +00:00
Etienne Ruffieux
865cad2665 Removed mocked BluetoothAdapter
Bluetooth adapter can not be mocked anymore, using config
resource instead.

Tag: #feature
Bug: 216422716
Test: robotest
Change-Id: I92e503cbceb8412031c7f3b08a3e1016d38da18c
2022-01-26 13:26:00 +00:00
Etienne Ruffieux
47d115c3ff Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 am: fe5b587245 am: 32c19cf335
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: Idb1f5503265f831f6efa7c20cb3b5f15dbafad75
2022-01-25 15:21:00 +00:00
Etienne Ruffieux
32c19cf335 Merge "Replaced use of Bluetooth resource by SystemApi" am: 49a9361062 am: 6f6f5e6b42 am: fe5b587245
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1939113

Change-Id: I96bcc99cc3eb5d1dab33246f1046bd646c72e119
2022-01-25 15:02:12 +00:00
Garfield Tan
7a380f3dc6 Ask user to reboot when enabling freeform and desktop mode
The introduction of FreeformTaskListener in WM shell requires a reboot
after enabling freeform support fully. Let's add a dialog explaining the
requirement and ask user to reboot the device.

Enabling desktop mode also requires a reboot to take effect, so this CL
also adds the support to it.

There is also a cancel button to dismiss the dialog without a reboot,
just in case users need to hold off the reboot for any reason.

Bug: 215437867
Test: Pressing OK reboots the device. Pressing Cancel dismisses the
dialog.
Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest
Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest

Change-Id: I553237a29751f73afa9fd4066241a19740872f6f
2022-01-24 21:19:46 -08:00
Florian Mayer
966aef4edd Add "Reboot with MTE" option for supported devices.
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.development.RebootWithMteDialogTest"
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.development.RebootWithMtePreferenceControllerTest"

Bug: 206895651

Change-Id: I38ef2c5aeb5c5d805afd4f1ab860f7a0a4d18e1c
2022-01-20 03:15:35 +00:00
Etienne Ruffieux
70c9f89e6f Replaced use of Bluetooth resource by SystemApi
Bluetooth resources are moved to the Bluetooth module,
we need to clear all existing usages of these resources.
Updated existing tests.

Tag: #feature
Test: make RunSettingsRoboTests
Bug: 211570675
Change-Id: I0f76df5043e69ed33cca40af3c32ac5b922b79ef
2022-01-13 17:22:35 +00:00
TreeHugger Robot
1cbb603d60 Merge "FRP bypass defense in the settings app" 2022-01-05 05:37:51 +00:00
Tsung-Mao Fang
07dd833a6a FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-01-05 12:10:00 +08:00
Michael Groover
d1f76eea72 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-01-03 17:35:02 +00:00
Stanley Wang
ff36bcce18 Merge "Fix the problem that the "Default USB configuration" item can not be searched." 2021-12-27 07:07:30 +00:00
Stanley Wang
ff1f09cacd Fix the problem that the "Default USB configuration" item can not
be searched.

The source of problem is that the controller does not extends the
PreferenceControllerMixin.

Fix: 211831988
Test: robo test and see the search result
Change-Id: I8bdc61bd567812ee484a959f2b058f315df9a3b3
2021-12-24 18:52:17 +08:00
Michael Groover
911f7e7aa9 Add unaudited exported flag to exposed runtime receivers
Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting T or later
registering a receiver for non-system broadcasts must specify either
the exported or not exported flag when invoking #registerReceiver;
if one of these flags is not provided, the platform will throw a
SecurityException. This commit updates all the exposed receivers
with a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing
behavior of exporting the receiver while also flagging the receiver
for audit before the T release.

Bug: 161145287
Test: Build
Change-Id: Ie97372efebd8258d9a4c503771d55109a85e6ae9
2021-12-09 20:34:02 -08:00
Etienne Ruffieux
0a3cbd319e Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf am: 328169a11c am: 76560b4e5b am: 3a0084534f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: Ib4065e57d28f4b253c45bb212fb157095a66403e
2021-12-06 16:34:05 +00:00
Etienne Ruffieux
3a0084534f Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf am: 328169a11c am: 76560b4e5b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: I50c12636bb26250d58a6bd69dc1887e304fb876a
2021-12-06 16:18:10 +00:00
Etienne Ruffieux
328169a11c Merge "Make BluetoothCodecConfig and BluetoothCodecStatus public" am: 0e1a4d3bdf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1849631

Change-Id: I248efd0968d1a4c3207d78c9d015142ba9e02030
2021-12-06 15:40:19 +00:00
Xin Li
bf45599d43 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
2021-11-11 16:54:23 +00:00
Etienne Ruffieux
e004eaa51b Make BluetoothCodecConfig and BluetoothCodecStatus public
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
2021-11-10 10:12:51 +00:00
Jason Chiu
7f6b9e26c9 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 am: 026b1b5df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Tim Peng
07b3675717 Phone fails to switch channel mode from stereo to mono
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
2021-10-29 03:28:14 +00:00
Roopa Sattiraju
04e10ffc28 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 am: ebc8a9fd1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I1261f696aa6d7a74c6b5bcdcc6e961fb7302d760
2021-10-14 18:46:52 +00:00