Commit Graph

37656 Commits

Author SHA1 Message Date
TreeHugger Robot
c1d6451625 Merge "Only launchHandoffToParent in SUW" into sc-dev am: 59b82fad2f am: 47cd5370f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179572

Change-Id: I21848b74c05430c73aa4107915adea72797b2898
2021-07-02 20:29:21 +00:00
TreeHugger Robot
59b82fad2f Merge "Only launchHandoffToParent in SUW" into sc-dev 2021-07-02 20:14:33 +00:00
TreeHugger Robot
eb353285eb Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488eefb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: I4e2a09cf38bbc09cd776f8047201a14ec56fda5d
2021-07-02 20:11:26 +00:00
TreeHugger Robot
8f9488eefb Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev 2021-07-02 19:59:32 +00:00
Kevin Chyn
c702e1bfba Only launchHandoffToParent in SUW
Settings flow does not need to show this screen

Fixes: 192586840
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true --ez skip_return_to_parent <true/false>
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Test: atest com.android.settings.biometrics.ParentalConsentHelperTest

Change-Id: Ic2edbb5ec9693d05c89206d49249f59fd968aa2f
2021-07-02 12:04:06 -07:00
Mill Chen
7b059195cb Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187825

Change-Id: If0575c7a060a3f16d75ae0b43886709023fdeff8
2021-07-02 19:03:08 +00:00
Mill Chen
81d98b0410 Merge "Update dynamic height adjusting" into sc-dev 2021-07-02 18:48:49 +00:00
Abel Tesfaye
2000bb8da2 Fix camera permission warning message not disappearing after permission is re-granted
Test: locally

Bug: 191907683
Change-Id: Idb45e99ff9f0569ad43aadcde830f0c69a3be4f3
2021-07-02 18:48:20 +00:00
TreeHugger Robot
9adce86e56 Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

Change-Id: Iab481dd43387d29b157043ab60f80fa3548d30eb
2021-07-02 16:40:44 +00:00
TreeHugger Robot
502bd5a438 Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: I553c1327ab3557bd15c8fd332158a958b5a9bdb1
2021-07-02 16:40:08 +00:00
Joshua Mccloskey
39d92e716a Merge "Refactored bad_calibration string" into sc-dev am: f68524f421
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I598bd323c32adc29e4b557c80c903c124dfeb72d
2021-07-02 16:34:58 +00:00
TreeHugger Robot
6d06f9bcad Merge "Align with the visibility logic from Dialer" into sc-dev 2021-07-02 16:17:09 +00:00
TreeHugger Robot
d5f9f65390 Merge "Switch back to sync IInputMethodManager" into sc-dev 2021-07-02 15:22:21 +00:00
Joshua Mccloskey
f68524f421 Merge "Refactored bad_calibration string" into sc-dev 2021-07-02 14:14:09 +00:00
Mill Chen
aede51f0e7 Update dynamic height adjusting
The current dynamic height adjusting workaround might cause that a
flicker problem happens in the collapsing toolbar and it might cause
that the collapsing toolbar has different background colors in some
setting pages. The new Material library has already supported the
dynamic height adjusting for multi-line titles, so we will use the new
mechanism instead.

Fix: 190997145
Test: go through Settings pages and check if there's a flicker problem
Change-Id: I9f27b1a887c8866ff7f5ed496de0c6e551a97b17
2021-07-02 21:56:34 +08:00
Tsung-Mao Fang
770f064d36 Align with the visibility logic from Dialer
Copy most visiblity logic from the Dialer app
We should check whether RTT is supported or not by querying Telecom.

Also, the rtt configuration won't be initialized properly before
user goes into the RTT page.
Prior to this cl, we set a wrong default value when we're showing
the subtext of RTT, this is not correct.
Currently, we simple show nothing in subtext if RTT haven't initilized
properly.

Test: Work with testing team to verify the behavior.
Fix: 188110773
Change-Id: I47c1983d15e22ef5a1fb3027334117a38a479558
2021-07-02 21:13:31 +08:00
Stanley Wang
8ec338480f Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: Icd0f2235d966904192c4aec500fe7e48d0e17136
2021-07-02 13:03:08 +00:00
Stanley Wang
371f699681 Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev 2021-07-02 12:51:23 +00:00
Alex Johnston
abf5a1a2f1 Merge "Remove credential management app Settings" into sc-dev am: 713d325310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I27d1c919f05d0bf1e50844c47ed03938c0a18700
2021-07-02 11:15:46 +00:00
Alex Johnston
713d325310 Merge "Remove credential management app Settings" into sc-dev 2021-07-02 11:05:49 +00:00
Arc Wang
636602c313 Merge "Fix profile tab text contrast problem" into sc-dev am: 8c8b79dab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165937

Change-Id: Iebdfb991505c05ecf7c265855af9cb78d73713e7
2021-07-02 10:23:15 +00:00
Arc Wang
0110423665 Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229

Change-Id: I522dcf99202b6ab757c930477c92d3068187d4df
2021-07-02 10:23:08 +00:00
Arc Wang
8c8b79dab5 Merge "Fix profile tab text contrast problem" into sc-dev 2021-07-02 10:05:21 +00:00
Arc Wang
68caefba32 Merge "Fix incorrect storage size in Storage Settings" into sc-dev 2021-07-02 10:05:16 +00:00
Tom Hsu
ebb36d4126 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454

Change-Id: I8567ac8442256cd4beb0891fcfacb052a26e03b2
2021-07-02 09:21:32 +00:00
Tom Hsu
c09f986580 Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev 2021-07-02 09:10:51 +00:00
Jernej Virag
73ac657abe Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I37862d807713adbbd721e832a7ba17cfa97c49ca
2021-07-02 08:54:50 +00:00
TreeHugger Robot
22cbf6cdde Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I69b126f7af645331a2b4815bcb3aa9133ede1cfd
2021-07-02 08:54:31 +00:00
Jernej Virag
1d2371eecd Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev 2021-07-02 08:51:17 +00:00
Stanley Wang
b757a6e9f2 Fix the problem that when the MainSwitchPreference is gone,
there will be a blank area.

- Disable the visibility of preference when the the hide() method
  is invoked.

Fix: 192332931
Test: robotest and see the UI
Change-Id: Iec5a06ca689843ebb692b1b7040f1d2be9f45bc2
2021-07-02 16:43:21 +08:00
TreeHugger Robot
e6cff5497d Merge "Password settings: Fix work profile" into sc-dev 2021-07-02 08:42:26 +00:00
TreeHugger Robot
cf423fbf96 Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372

Change-Id: I2358bbcd3186012e583c8357ecbd5893deeea9a6
2021-07-02 08:19:14 +00:00
TreeHugger Robot
235006fc35 Merge "Move selectability to switch from container" into sc-dev 2021-07-02 08:03:25 +00:00
TreeHugger Robot
593ab6faab Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652

Change-Id: If5ffafd6426bd6d942b8a44fa1dd2c7317c31af0
2021-07-02 06:42:28 +00:00
TreeHugger Robot
f1b07d7ddd Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev 2021-07-02 06:40:15 +00:00
George Chang
3096bae20d Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: Ic46613a626882f06ac273c1cfb9dc1020889db33
2021-07-02 06:38:16 +00:00
George Chang
cd4a4ad90a Merge "Separate NFC on/off strings" into sc-dev 2021-07-02 06:23:03 +00:00
TreeHugger Robot
58d95b41c9 Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314

Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4
2021-07-02 05:38:18 +00:00
TreeHugger Robot
33a9e928fb Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945

Change-Id: Ie661943ee6352757a03f928c9db6e729927a8b7e
2021-07-02 05:38:12 +00:00
TreeHugger Robot
77f0dbaa26 Merge "Correct the choose screen lock page" into sc-dev 2021-07-02 05:26:38 +00:00
TreeHugger Robot
65c9b03fb5 Merge "Fix multiple biometrics enrollment flow" into sc-dev 2021-07-02 05:26:18 +00:00
Yohei Yukawa
a78e1f51fe Switch back to sync IInputMethodManager
This logically reverts two recent CLs [1][2] to submit a corresponding
logical revert [3] into frameworks/base to address Bug 190486491.

 [1]: I767069892c713023b064525105ef2b55946b7bb8
      8279b8ee5a
 [2]: I6733e8b500f5e02d4e14cde4ab7a46f4f716f5d0
      fa01bf30ba
 [3]: If16ac0de536d9089eb04f6e07b1ee47378124658

Bug: 163453493
Bug: 190486491
Test: make RunSettingsRoboTests ROBOTEST_FILTER="WinscopeTraceTest"
Change-Id: Idea98bd36935a27d886ca337154112e7dd293080
Merged-In: Idea98bd36935a27d886ca337154112e7dd293080
2021-07-01 21:24:02 -07:00
Yanting Yang
9fd3223b5a Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I8063aed6ceeaf85500d331ce793f38135abf4a9c
2021-07-02 04:09:17 +00:00
Yanting Yang
62315005fd Merge "Remove stale search result about "Recent location requests" page" into sc-dev 2021-07-02 03:59:29 +00:00
George Chang
96b5af7e39 Separate NFC on/off strings
For pt-BR, it needs a different gender when we are referring to "NFC".

Bug: 189314407
Test: check On/Off strings
Change-Id: I87da43c66a65b3ef2fcd9c57632b36302d9920e8
2021-07-02 11:20:03 +08:00
Arc Wang
25880d0d0e Fix incorrect storage size in Storage Settings
From Android S, Storage Settings queries file sizes
from MediaProvider, it's not necessary to count size
data from getExternalStorageStats when calculating
size data.

Bug: 185542752
Test: make RunSettingsRoboTests ROBOTEST_FILTER=testMeasurementCompletedUpdatesPreferences
      manual
      1. Connect device to PC via USB File transfer.
      2. Copy large files from PC to device.
      3. Observe size information in Storage Settings.
Change-Id: I43cbec764e97f5003a4ec981717c9f213a21b614
2021-07-02 10:57:57 +08:00
Abel Tesfaye
f60885a040 Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate
Bug: 191924078

Test: locally on crosshatch
Change-Id: I8464860c3d1d59c5d4549e7c488457e92054dbba
2021-07-01 19:17:37 +00:00
Julia Reynolds
94ffc288bd Move selectability to switch from container
To better work with SwitchAcccess

Test: manual with Switch Access (with labels on) and Talkback
Fixes: 189074205
Change-Id: Iafbc4eca9bce8c979ec16a743509b46727cd9eb6
2021-07-01 14:08:39 -04:00
TreeHugger Robot
18f3c51a44 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: Ife7873e34cb5410a36acb0a95abcd4e183ee12e0
2021-07-01 17:49:36 +00:00
TreeHugger Robot
af63867d08 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev 2021-07-01 17:35:51 +00:00