PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,011 Commits 1 Branch 0 Tags
ff80b3c8f901b5d000db7e4b68c55757674d6249
Commit Graph

93011 Commits

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

Change-Id: I394274fbc0bf313f5d30fe22e0f5eff890b4d2da
 2021-07-02 20:29:15 +00:00
TreeHugger Robot
da940c936d 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: I5a7b3a82a7d088f9147136a75979a3d00f48e953
 2021-07-02 20:28:43 +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
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
cbb37cc2a8 Merge "Fix camera permission warning message not disappearing after permission is re-granted" into sc-dev am: 8f9488eefb am: c1a0610bd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084370

Change-Id: Ie516395b9c924adc7c42c9ebfa15f59c2b530f94
 2021-07-02 20:19:41 +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
c1a0610bd5 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: I2704176c17a986a630658907c38af2ff0038cfa8
 2021-07-02 20:11:30 +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
e9ab130cfe Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410 am: fc71a868e6 am: 0cdae92bf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187825

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

Change-Id: Ic229cfb7e8b2abe418d3bbb28d0b3745f9e1bacb
 2021-07-02 19:33:24 +00: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
0508289edc Merge "Update dynamic height adjusting" into sc-dev am: 81d98b0410 am: 2e23b3ff08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15187825

Change-Id: I15f6d134c7084e9a03416b3f8f68f35adab2e64f
 2021-07-02 19:20:51 +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
2e23b3ff08 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: I10d435d6dd391a25ce4c8e6f161760d656980c84
 2021-07-02 19:02:55 +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
097e7bb6f0 Merge "Tweak work contact search strings" into sc-dev am: d76acbd981 am: 67542a71b1 am: 0eb06a2112 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

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

Change-Id: I4d4e2857d93094328cb5f7e16479aaa613ff54c7
 2021-07-02 17:55:19 +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
d021f95945 Merge "Tweak work contact search strings" into sc-dev am: d76acbd981 am: 8663c86005 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15178135

Change-Id: I93242d5f1614c1f5760b8886ccdcc4f114101775
 2021-07-02 17:41:33 +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
8663c86005 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: Ib50ed55870fb4d86fdb82a8643a0cfc98e7c793d
 2021-07-02 17:27:53 +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
061a647a20 Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad am: 9adce86e56 am: deb5e1d719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

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

Change-Id: I94313909daa5dbba90616615afd2e2feaa6c8e0a
 2021-07-02 16:58:38 +00:00
TreeHugger Robot
eea6016c07 [automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 502bd5a438 -s ours am: b515ce8d1c -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: I979cd39c11a8206a0806e46364b69a18686f2d5c
 2021-07-02 16:54:34 +00:00
Stanley Wang
dbd4c6685c Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: 9064037c38 am: 3c16f2553d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

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

Change-Id: I78f34a5cbe2dff3a574ea83fe6ac9d5472a48c88
 2021-07-02 16:48:40 +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
9c41116855 Merge "Align with the visibility logic from Dialer" into sc-dev am: 6d06f9bcad am: abbcd960cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080735

Change-Id: Ie9739c235b10bd2e3ab37239419eaa368f37c44d
 2021-07-02 16:45:54 +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