Commit Graph

85624 Commits

Author SHA1 Message Date
TreeHugger Robot
000ad1cfe4 Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488eefb am: eb353285eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: Ie982126b299f8aa7cd7c0c82507b37fbe2d0f10b
2021-07-02 20:20:38 +00:00
TreeHugger Robot
47cd5370f3 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: Ied5043d3eac50524d7ac3e674f2a87a54d8208d7
2021-07-02 20:16:14 +00:00
TreeHugger Robot
59b82fad2f Merge "Only launchHandoffToParent in SUW" into sc-dev 2021-07-02 20:14:33 +00:00
TreeHugger Robot
6e647c7142 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: I2e6eea01803aa137b1a3e37892fe1ca1ce566a3b
2021-07-02 20:12:25 +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
Mill Chen
0cdae92bf2 Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410 am: fc71a868e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187825

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

Change-Id: Ieb446bc7075993de2f3cb76bd6e93e61ec33b3b5
2021-07-02 19:21:38 +00:00
Mill Chen
fc71a868e6 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: I417bb71d4dc2f855fb56be7b2cadcf49cf1664f3
2021-07-02 19:04:31 +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
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
0eb06a2112 Merge "Tweak work contact search strings" into sc-dev am: d76acbd981 am: 67542a71b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: Iba1fe2296e3d4bb6474cabe19b6d9d09b81bb1db
2021-07-02 17:42:21 +00:00
TreeHugger Robot
cd6eabc5ff Merge "Tweak work contact search strings" into sc-dev am: d76acbd981 am: 0bdf82747c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: I7341b7f989a8414394e3c47516bd3202cace66f4
2021-07-02 17:41:58 +00:00
TreeHugger Robot
0bdf82747c Merge "Tweak work contact search strings" into sc-dev am: d76acbd981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: I7a5355e95f9d1798fb48a8b3b0c632c43112fd05
2021-07-02 17:28:39 +00:00
TreeHugger Robot
67542a71b1 Merge "Tweak work contact search strings" into sc-dev am: d76acbd981
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: I98cba7e8f61ebd6f2f0e2d49cadf398ff2767f97
2021-07-02 17:27:28 +00:00
TreeHugger Robot
d76acbd981 Merge "Tweak work contact search strings" into sc-dev 2021-07-02 17:14:30 +00:00
TreeHugger Robot
deb5e1d719 Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad am: 9adce86e56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

Change-Id: I655abc7598aad32230cb6d478cd6243ccacdb975
2021-07-02 16:47:07 +00:00
TreeHugger Robot
c05d2e1b44 Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad am: 98afff23b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

Change-Id: Ie4459c303ebe7ce874e22ba8a279a6a757c36914
2021-07-02 16:46:23 +00:00
TreeHugger Robot
b515ce8d1c [automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 502bd5a438 -s ours
am skip reason: Merged-In Idea98bd36935a27d886ca337154112e7dd293080 with SHA-1 a78e1f51fe is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: Id2494946136487af20ff5e7258312e9141170447
2021-07-02 16:44:34 +00:00
Stanley Wang
3c16f2553d Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: 9064037c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: Ib39f51c1318f189151738e2ebac26aadab54b6d3
2021-07-02 16:44: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
d8fa8dbb85 Merge "Refactored bad_calibration string" into sc-dev am: f68524f421 am: 39d92e716a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: Ic62b42e45c02ba2265ba36c0449fe27e600ed361
2021-07-02 16:39:06 +00:00
Stanley Wang
9064037c38 Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I7dcdbae537adaba905ac950710f21417e23e8843
2021-07-02 16:38:57 +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
98afff23b8 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: Id3f3587fdb991fb76060994d740d9950d90b31fd
2021-07-02 16:30:19 +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
b96605dbfb Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 8b946a48c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177777

Change-Id: I7ac4996556cceb31f21c969954b9d5c1050ae8b3
2021-07-02 15:52:55 +00:00
TreeHugger Robot
8b946a48c6 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: I4c568bce7611c18da3460e13e182f8d49158ceb7
2021-07-02 15:37:19 +00:00
TreeHugger Robot
d5f9f65390 Merge "Switch back to sync IInputMethodManager" into sc-dev 2021-07-02 15:22:21 +00:00
Weng Su
71e728e934 Add permission checking to WifiDialogActivity
- Use getCallingPackage() to get calling package.

- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.

- Only set result data to permission granted callers

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
2021-07-02 23:10:11 +08:00
Stanley Wang
c73ec5673e Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: ed113a13a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I56c1c4169f88047ef8cb84ff46241ffce7c49058
2021-07-02 14:52:01 +00:00
Stanley Wang
ed113a13a6 Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I937accc49da79a856614b892a4e7447e2ebd35c7
2021-07-02 14:36:30 +00:00
Joshua Mccloskey
f61582576e Merge "Refactored bad_calibration string" into sc-dev am: f68524f421 am: c248869813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I30759839032803fac82f4c39a8d0a969c1c9d0ec
2021-07-02 14:29:23 +00:00
Stanley Wang
88e914e74e Merge "Update Adaptive brightness page." into sc-dev 2021-07-02 14:24:34 +00:00
Joshua Mccloskey
c248869813 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: I73ef5fd5b2fded5f75d34eedc715d1e7a7188bdf
2021-07-02 14:16:58 +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
Stanley Wang
d3ee311ab4 Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681 am: 8ec338480f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: Ia79a077f5cf3dc79a47a0e267efaba68874de819
2021-07-02 13:21:19 +00:00
Stanley Wang
6d903b19fb Merge "Fix the problem that when the MainSwitchPreference is gone, there will be a blank area." into sc-dev am: 371f699681 am: 0727b0e730
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173151

Change-Id: I8833fff766451648d327038236385e961d555201
2021-07-02 13:20:53 +00: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
8f774b908f Update Adaptive brightness page.
- Use the IllustrationPreference widget and update the
  new illustration.

Fix: 192415034
Test: robotest and see the UI
Change-Id: I2feb3faab0abd2fa0fc36b8bb94f6b02ec3f7dd7
2021-07-02 13:07:10 +00:00
Stanley Wang
0727b0e730 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: I5938687eeea4e8886a41a242f860ea84c35e14b1
2021-07-02 13:03:52 +00:00
Alex Kershaw
96d184e106 Tweak work contact search strings
Bug: 184610902
Test: treehugger
Change-Id: I06660aef9a21fb5fc6a1ea2e50496e92181cd865
2021-07-02 14:03:40 +01: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