Rajeev Kumar
69331d742c
Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1 am: 69bd5a4fc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293
Change-Id: Ib49c1f6b9b20972ba0bab335218fd09593830b62
2021-07-04 20:53:31 +00:00
Rajeev Kumar
dc07fe1ad1
Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev
2021-07-04 19:14:33 +00:00
Ahaan Ugale
0cc68e8510
Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev am: 83e4f3c658
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177778
Change-Id: I64edc40f8c59526707832dc7afb4e26cdb82d023
2021-07-03 00:07:27 +00:00
TreeHugger Robot
5adc2d8447
Merge "Fix landscape to reverse landscape issue" into sc-dev am: 493db88bf4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15188505
Change-Id: Iab537b422edbe98b94f90cb20a95d1ef8e09a61a
2021-07-03 00:07:16 +00:00
Ahaan Ugale
83e4f3c658
Merge "Password settings: use EM DASH as the pwd count placeholder" into sc-dev
2021-07-02 23:56:20 +00:00
TreeHugger Robot
493db88bf4
Merge "Fix landscape to reverse landscape issue" into sc-dev
2021-07-02 23:49:36 +00:00
TreeHugger Robot
524f4979f5
Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev
2021-07-02 23:02:30 +00:00
Mill Chen
7f2496219f
Fix landscape to reverse landscape issue
...
Fingerprint enrollment page needs to display different types of layout
for both landscape mode and reverse landscape mode. However
onConfigurationChanged doesn't get called when landscape mode rotates to
reverse landscape mode directly, that causes it displays a wrong layout
in the both landscape and reverse landscape modes.
Trying to monitor rotation event and checking if the case that directly
turns landscape mode to reverse landscape mode happens, if so, reCreate
method will get called to re-lay out the page. There will be a flicker
problem happening in re-laying out the page but this solution still
works for users to have the correct layout.
Fix: 186372522
Test: manual test
1) Navigate to fingerprint enrollment page
2) Rotate the screen from landscape mode to reverse landscape mode
3) Observe the page and see if it has a correct layout
Change-Id: Ie94f43a6546f453c10ae9f1c3ba83e1178784950
2021-07-03 06:40:25 +08:00
Rahul Sabnis
aa8275f8d3
Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 am: 3b68dd138c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1716270
Change-Id: I9c37ec40573808a91c6052e2d46cce28df7cfead
2021-07-02 22:31:25 +00:00
Rahul Sabnis
bec574dca7
Merge "Ensure settings maintains its Bluetooth device inquiry state"
2021-07-02 22:01:50 +00:00
TreeHugger Robot
4f33fea213
Merge "Only launchHandoffToParent in SUW" into sc-dev am: 59b82fad2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179572
Change-Id: I089b19e5cfbc10a4e22dced38e24b337a66bc41c
2021-07-02 20:28:39 +00:00
Rahul Sabnis
0b365c3e69
Ensure settings maintains its Bluetooth device inquiry state
...
Bug: 187165224
Test: Manual
Merged-In: I4dafb7bf5b410d99cba7e30ee17f966611458db7
Change-Id: I4dafb7bf5b410d99cba7e30ee17f966611458db7
2021-07-02 20:27:17 +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
Ahaan Ugale
30a3e3c3ed
Password settings: use EM DASH as the pwd count placeholder
...
The current blank space in the UI looks like a bug if the password
manager doesn't return a result. (though this should rarely happen)
Fix: 192531856
Test: manual
Change-Id: Ia1765e51f1d4e5080c9a8419c8e81c2771caba7b
2021-07-02 12:35:40 -07: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
Yanli Wan
796ce5ee10
Show device admin warning dialog if force stop is not allowed
...
Test: manual
Test: atest AppButtonsPreferenceControllerTest
Bug: 192082470
Change-Id: I2c0028b4ff4578221a7686a3fe4511c70e1eed7d
2021-07-02 17:52:17 +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