Commit Graph

35758 Commits

Author SHA1 Message Date
TreeHugger Robot
1f657a95ae Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3636c58d85d3df9945418203333f62ec20ced928
2021-03-11 23:14:48 +00:00
TreeHugger Robot
9086ed36a8 Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev 2021-03-11 22:37:50 +00:00
Fan Zhang
9fdceaea78 Fallback to AOSP eSOS settings page if OEM impl fails
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)

Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
2021-03-11 20:30:55 +00:00
Sally Yuen
c2025d7180 Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev 2021-03-11 17:41:42 +00:00
Almaz Mingaleev
5238602615 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev am: 4a3ff95367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia67d2fba5b231a7508158c61df75cae77717b4ab
2021-03-11 14:22:19 +00:00
Almaz Mingaleev
4a3ff95367 Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev 2021-03-11 14:04:01 +00:00
Wesley Wang
54b58b9a97 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev am: 1d5d101aa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id96b38dce8a4dc895bbd2263df16c17294bf0fa4
2021-03-11 08:07:53 +00:00
Arc Wang
c57f2917bd Merge "Hide non-system overlay window on ActivityPicker" into sc-dev am: 3d1658e93d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief0358d51ddbace52059bbe3f8860fcac6ef1629
2021-03-11 08:07:40 +00:00
Wesley Wang
1d5d101aa6 Merge "Update UsageProgressBarPref icon when device is charging or low battery" into sc-dev 2021-03-11 07:53:12 +00:00
Arc Wang
3d1658e93d Merge "Hide non-system overlay window on ActivityPicker" into sc-dev 2021-03-11 07:45:43 +00:00
TreeHugger Robot
921567214d Merge "Use title area for enrollment error messages" into sc-dev am: 53d7495162
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824391

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id960686ac67fad4be87622d6ad81bf745bd42a62
2021-03-11 06:44:26 +00:00
Wesley.CW Wang
e940dcb448 Update UsageProgressBarPref icon when device is charging or low battery
- Add new icon for battery low state
 - Update UsageProgressBarPref icon when charging or low battery
 Screenshots:
   https://screenshot.googleplex.com/9HBvV6t6dVsG8eD.png
   https://screenshot.googleplex.com/6TsRu6BTN338FvT.png
   https://screenshot.googleplex.com/nGE29cfsmgKuuaP.png
   https://screenshot.googleplex.com/85NWXSg2PevXAsy.png

Bug: 179237746
Test: make RunSettingsRoboTests -j40
Change-Id: I057874bbf45594c90466cf346b054bf033815dac
2021-03-11 06:32:20 +00:00
TreeHugger Robot
53d7495162 Merge "Use title area for enrollment error messages" into sc-dev 2021-03-11 06:16:42 +00:00
Yi Jiang
5531480a80 Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev am: 5c11109ffc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If656cd60942d21319e1f49044285141bdfb5643f
2021-03-11 05:14:04 +00:00
Yi Jiang
5c11109ffc Merge "Fixes UI style issues in Screen Timeout setting" into sc-dev 2021-03-11 04:48:04 +00:00
Arc Wang
3b4853e109 Hide non-system overlay window on ActivityPicker
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-03-11 12:10:18 +08:00
Treehugger Robot
c96d4d9328 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f am: 2817c677b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91223c2147f0ea173fe4bb8675d692fba0f80615
2021-03-11 03:59:54 +00:00
Treehugger Robot
2817c677b1 Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f am: eda1be644f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I755a0f00c44dfd39b84e4f843a1553de2e8850a2
2021-03-11 03:23:22 +00:00
Treehugger Robot
eda1be644f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 am: dac69ccd8f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80ebc15814491a28b3da23b6554b81022ab49db3
2021-03-11 02:41:39 +00:00
Kevin Chyn
4ff118db02 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev am: 13b05b6fb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13820985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6343bd4f0c9cfcb3d76cb11ed627f8ec54680ab
2021-03-11 02:00:45 +00:00
Kevin Chyn
26e7d7d23a Update revokeChallenge together with frameworks/base am: e91e39b604
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13818078

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76939100b1559b07ef29c58e7e348296f246bbc0
2021-03-11 02:00:43 +00:00
Kevin Chyn
13b05b6fb8 Merge changes from topics "fp-revokeChallenge", "new-revokeChallenge" into sc-dev
* changes:
  Update fingerprint revokeChallenge with frameworks/base
  Update revokeChallenge together with frameworks/base
2021-03-11 01:14:15 +00:00
jasonwshsu
ffe8521b9f Add seekBar properties 'tickMark' to LabeledSeekBarPreference
Bug: 173940869
Test: manual
Change-Id: I135e52181bdb86ded6187a3fa30b9cffeb69d451
(cherry picked from commit 9584ba6b57)
2021-03-10 23:34:26 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00
Yi Jiang
01f1c660a0 Fixes UI style issues in Screen Timeout setting
1. Remove help url and search icon.
2. Uses BannerMessage for permission missing notification.

Test: manual
Bug: 182297705
Change-Id: Id4dc998d7276f4c4f7593b1b0312d92097ec83cf
2021-03-10 12:58:46 -08:00
Ahaan Ugale
6819eb7a83 Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev am: e9355553ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13797113

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7276a0f144ca9787c220efbb884a07841dda0a4
2021-03-10 20:15:17 +00:00
Ahaan Ugale
e9355553ee Merge "AF: Unit tests for PasswordsPreferenceController." into sc-dev 2021-03-10 20:08:08 +00:00
Yohei Yukawa
5878a77218 Update src/com/android/settings/inputmethod/OWNERS
Let's update this legacy OWNERS file based on the current reality.

Hopefully this would make it easier for contributers to find available
owner reviewers.

Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
2021-03-10 10:37:51 -08:00
Mill Chen
a01f882e61 Use title area for enrollment error messages
This CL is trying to put the enrollment error messages into the title
area for UDFPS, and left the red text for the older devices with a rear
fingerprint.

Fixes: 178432748
Test: visual verified
Change-Id: Ib3a81531219dc963723ad0de99f079a230c580f5
2021-03-10 19:46:13 +08:00
Almaz Mingaleev
ab05918e08 Move GeoTZ toggle to Date&Time settings screen.
Previous sub-menu is deleted.

Toggle is always enabled and shows current configuration
setting. If MLS or auto time zone detection is off,
the toggle has not effect.

Bug: 152746236
Test: toggled and checked dumpsys time_zone_detector
Test: checked summary info on different MLS/set time zone automatically
states combinations
Test: m -j30 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"

Change-Id: I75ee41cfcaaf34b1b63e18809be4cd614446017d
Merged-In: I75ee41cfcaaf34b1b63e18809be4cd614446017d
2021-03-10 11:07:36 +00:00
Yanting Yang
8d6f0c36e4 Merge "Update metrics category for new app page" into sc-dev am: 16b6910b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806594

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied3951c2b266c2597e53a5cc9745bba22f6d29cc
2021-03-10 09:16:33 +00:00
Yanting Yang
16b6910b7d Merge "Update metrics category for new app page" into sc-dev 2021-03-10 08:43:13 +00:00
Ahaan Ugale
1515b2bb78 AF: Unit tests for PasswordsPreferenceController.
Bug: 169455298
Test: atest SettingsUnitTests:com.android.settings.applications.autofill.PasswordsPreferenceControllerTest
Change-Id: I5cbbb17f192b963a634690a95a591d3f51f47436
2021-03-09 20:08:06 -08:00
TreeHugger Robot
0c2c60af30 Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev am: 38e19abdf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805366

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fd02331e302a6f131e7fc0ab770413feb7453d0
2021-03-10 02:34:41 +00:00
Kevin Chyn
39b2fe8bd5 Update fingerprint revokeChallenge with frameworks/base
Bug: 181977689
Test: manual
Change-Id: I92e6dae58d67f1355c6d0ba3bbf95ff2ad5247ed
2021-03-09 18:12:54 -08:00
TreeHugger Robot
38e19abdf7 Merge "[Provider Model] Add Wi-Fi toggle slice" into sc-dev 2021-03-10 01:44:42 +00:00
Kevin Chyn
e91e39b604 Update revokeChallenge together with frameworks/base
Bug: 181977689
Test: Inspect logs
Change-Id: I588ec46896d57d89489f78505a6f2c932462b2d2
2021-03-09 16:25:28 -08:00
Salud Lemus
1416440b40 Merge "Remove default admin support message for an Enterprise device" into sc-dev am: b687a9757c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13810347

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3596b893746f5cbfdd692e2d311b23d1f296fef8
2021-03-10 00:25:08 +00:00
Salud Lemus
b687a9757c Merge "Remove default admin support message for an Enterprise device" into sc-dev 2021-03-10 00:21:37 +00:00
Abel Tesfaye
fe5f0e752e Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev am: e604c56241
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13777300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f316b66f67e13a8482ec8fe6161cf84f28c549a
2021-03-09 17:41:00 +00:00
Abel Tesfaye
e604c56241 Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev 2021-03-09 17:39:50 +00:00
Ahaan Ugale
2fa45b23c6 Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev am: c21337d44f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804075

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f2d73c1e326f1aded1f5249efa192fcd8f5e846
2021-03-09 17:38:42 +00:00
Ahaan Ugale
581cf9759f Merge "Add javadoc about lifecycles for xml defined Controllers." into sc-dev am: b4b0207e09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13804074

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I304b3775c415826cb0924a0a766a39dc25e000a4
2021-03-09 17:38:34 +00:00
Ahaan Ugale
c21337d44f Merge "Use androidx LifecycleObserver for wiring up controller lifecycles." into sc-dev 2021-03-09 17:11:53 +00:00
Ahaan Ugale
b4b0207e09 Merge "Add javadoc about lifecycles for xml defined Controllers." into sc-dev 2021-03-09 17:11:53 +00:00
Ahaan Ugale
042c5b40b7 Use androidx LifecycleObserver for wiring up controller lifecycles.
DashboardFragment automatically wires up Controllers that implement the
deprecated settingslib LifecycleObserver. Now it can also work for those
that implement the androidx version. The settingslib LifecycleObserver
extends the androidx one, so existing behaviour is preserved.

Bug: 169455298
Test: manual - lifecycles work automatically for such Controllers
Test: manual - no duplicate lifecycle events for existing Controllers
Change-Id: I39ac69f24bf8577867ba3b7e56f96c5f38722a2f
2021-03-09 17:11:08 +00:00
Salud Lemus
52565ad5e9 Remove default admin support message for an Enterprise device
Bug: 182195172
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: Ie844eee14ff0cc6a1c2f9dd0485c865f4e5e3e72
2021-03-09 16:16:33 +00:00
Victoria Lestari
084bfccadc Merge "Revert "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default""" into sc-dev am: f760ea0639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13785874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0676b9e1c0ce3c46b54c9f632cd8c5d18884b545
2021-03-09 15:04:26 +00:00
Victoria Lestari
f760ea0639 Merge "Revert "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default""" into sc-dev 2021-03-09 14:32:12 +00:00
Zoey Chen
9988792138 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib339b36768196e6e5f676944754d5736937b16cd
2021-03-09 11:51:04 +00:00