Commit Graph

92084 Commits

Author SHA1 Message Date
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
TreeHugger Robot
abbcd960cc 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: I417e7022751af450a3cf51849ba73d01e778ffb4
2021-07-02 16:29:17 +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
47b7b42b5f [automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 8b946a48c6 am: b96605dbfb -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: I33e25f0d31e6d42237397c82eead7328a8995e23
2021-07-02 16:05:32 +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
4861af726b [automerger skipped] Merge "Switch back to sync IInputMethodManager" into sc-dev am: d5f9f65390 am: 88605e7b2a -s ours
am skip reason: Merged-In Idea98bd36935a27d886ca337154112e7dd293080 with SHA-1 3e20e0ec37 is already in history

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

Change-Id: Ia6a61ce6481d390c4c4bf3cce6c6918cb3ec9970
2021-07-02 15:51:35 +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
88605e7b2a 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: Ib33ab9d9c7eccbefa20f65d3855368836671b734
2021-07-02 15:36:53 +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
c26f538aeb Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: ed113a13a6 am: c73ec5673e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: I131a2275b6ca94b4d82eb7e04497ab3f25754837
2021-07-02 15:01:25 +00: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
50ae642680 Merge "Update Adaptive brightness page." into sc-dev am: 88e914e74e am: 8ac219bea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153302

Change-Id: Ib37d6cdfc4bbb7b651cb24e6257f81a04734f4b3
2021-07-02 14:51:33 +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
Stanley Wang
8ac219bea0 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: Idb4612119bcba83050f3882aa22bf3d1b54ccecf
2021-07-02 14:35:41 +00:00
Joshua Mccloskey
ad264114b4 Merge "Refactored bad_calibration string" into sc-dev am: f68524f421 am: c248869813 am: f61582576e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I38d7f3c945b7ad9774d74866f8965cfb5c33ddd1
2021-07-02 14:33:48 +00:00
Joshua Mccloskey
332f6734bf Merge "Refactored bad_calibration string" into sc-dev am: f68524f421 am: b9a07f12bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15157294

Change-Id: I26c2f18987d3323ac3667786c6f1b91021238323
2021-07-02 14:33:36 +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
Yohei Yukawa
b6ab3ad813 Merge "Switch back to sync IInputMethodManager" 2021-07-02 14:28:50 +00:00
Stanley Wang
88e914e74e Merge "Update Adaptive brightness page." into sc-dev 2021-07-02 14:24:34 +00:00
Joshua Mccloskey
b9a07f12bd 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: Ibdf3885f06d4d313ef422d4a677de498342ef47d
2021-07-02 14:17:35 +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