Commit Graph

80100 Commits

Author SHA1 Message Date
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
Treehugger Robot
dac69ccd8f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
2021-03-11 00:58:01 +00:00
Sooraj Sasindran
1ce8eb765a update isCrossSimCallingEnabledByUser name
update isCrossSimCallingEnabledByUser name to
isCrossSimCallingEnabled

Bug: 179143945
Test: build
Change-Id: I8bb0196cc04dc437ed709548ecd569c4dd7828a1
2021-03-10 16:43:49 -08:00
Andras Kloczl
6746add669 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:46 +00:00
Andras Kloczl
9c0024f455 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I258c305f825da94474c8027828e3b9707b463699
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:16:03 +00:00
Andras Kloczl
e0f8214e80 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0 Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Andras Kloczl
07e414017c Prevent using invalid result uri during multi user image change
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:13:05 +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
Abel Tesfaye
bf182903ed Merge "Update autorotate search terms" into sc-dev 2021-03-10 23:25:37 +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
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
0023100e7f Declare activities for factory reset pages
When trying to trigger factory reset from Settings app, it's unexpected
that Settings will get a fatal ActivityNotFoundException, causing
Settings crash. The factory reset pages have changed their launching
way from by SubSettingsLauncher to by startActivity directly. These
activities haven't been declared in AndroidManifest.xml, which caused
this issue.

Fixes: 182144129
Test: rebuild and manual
1) Flash the device with aosp build
2) Navigate to Reset options (Settings -> System -> Reset options)
3) Observe and check if Settings gets crashed

Change-Id: Ia99f269e237d7c84153d4b903cbca14c33835dc1
2021-03-11 01:39:03 +08:00
Weng Su
6a0ef56917 [Provider Model] Adjust slice title and subtitle
- Show "Airplane mode" title when airplane mode is enabled

- Remove "Airplane mode is on" subtitle

- Show "Wi-Fi is turned on" subtitle when both airplane mode and Wi-Fi
is enabled

- Remove the function related to isApmNetworksAvailable()

- Screenshot:
  https://screenshot.googleplex.com/6X9nzmXRCUfw4Lp
  https://screenshot.googleplex.com/6jQryMjU2yDDpmM

Bug: 181858434
Test: manual test
atest -c InternetConnectivityPanelTest \
         InternetPreferenceControllerTest \
         InternetUpdaterTest

Change-Id: I84e5d4c60ed91d58443b27c35286a84bf72ac173
2021-03-10 22:34:35 +08:00
TreeHugger Robot
8c6564b67e Merge "Prevent a larger title from displaying incompletely" into sc-dev 2021-03-10 12:10:10 +00: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
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
mincheli
205182c725 Updates magnification settings string
See Accessibility strings for S
b/182118401#comment5

Bug: 182118401
Test: manual test
Change-Id: I6e0d972d725c4f3e95072d5df1badfbbde6394d5
2021-03-10 04:01:59 +00:00
Mill Chen
a5c91ef0fe Prevent a larger title from displaying incompletely
Some larger titles in the accessibility will be wrapped into 2 lines and
the tille looks like incomplete. This is because after starting to
scroll down, the collasping toolbar detected the length of title is
longer than the width of container and wrapped the title into 2 lines.

To prevent this, we intented to reduce the end margin for the collapsing
toolbar.

Fixes: 182235627
Test: visual verified
1) Adjust font size to largest
2) Navigate to Settings -> Accessibility -> Text and display -> Color
correction
3) Observe and see if the title is wrapped into 2 lines

Change-Id: I1595b9ab4f8406bf6505f56786438c9030b5be59
2021-03-10 10:51:38 +08: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
b687a9757c Merge "Remove default admin support message for an Enterprise device" into sc-dev 2021-03-10 00:21:37 +00:00
TreeHugger Robot
48f6ec410e Merge "Implement temporary asset in settings page" into sc-dev 2021-03-09 23:50:44 +00:00
Abel Tesfaye
da3a845c4f Update autorotate search terms
Test: local

Bug: 182226081
Change-Id: I6665046a34aad19c245585bfd3d997d631c52bea
2021-03-09 21:12:36 +00:00
Abel Tesfaye
e604c56241 Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev 2021-03-09 17:39:50 +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
Jason Chang
64f09c85da Implement temporary asset in settings page
Apply temporary asset at the top of One-Handed mode page in Settings.

Bug: 181729503
Test: manual
Change-Id: I17662f7c283ae2a55d0320fd203465c06365b911
2021-03-10 00:40:59 +08: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
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
0872d40a75 [automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f am: 9988792138 -s ours
am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e40 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bfec84b83d21d8950058007bb378f292f743dc7
2021-03-09 12:32:38 +00:00
TreeHugger Robot
be1b2f307d Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev 2021-03-09 12:29:48 +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
Zoey Chen
6003cb977f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e70590d8d29451f0906f09e3d90e847e74d9f7
2021-03-09 11:21:49 +00:00
SongFerngWang
4ccbe5d785 Change the behavior of notifyAllowedNetworkTypesChanged.
Bug: 180903931
Test: atest AllowedNetworkTypesListenerTest.java
Change-Id: Ic94816415920bf25896ef2b198e228f369039c94
2021-03-09 18:36:01 +08:00
Zoey Chen
9abf2bff3b Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" 2021-03-09 10:35:53 +00:00
Weng Su
78a5522879 Fix the broken test on NetworkProviderSettingsTest
- Mock the UserManager for restricted component

Bug: 182147117
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ica5bfc8ecd0a7a786ec6fec439998696eed04266
2021-03-09 17:38:40 +08:00
TreeHugger Robot
50129cc4db Merge "Prevent app bar title from drawing twice" into sc-dev 2021-03-09 09:20:58 +00:00
TreeHugger Robot
3dacd0209c Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev 2021-03-09 08:03:05 +00:00
TreeHugger Robot
6ef1bc7336 Merge "Update fingerprint layouts for landscape" into sc-dev 2021-03-09 07:26:20 +00:00
Mill Chen
db5ca4ee1a Prevent app bar title from drawing twice
Sometimes we could see a flick problem with app bar title. It appears to
draw the app bar title twice. This CL is to prevent app bar title from
rendering twice.

Bug: 182232144
Test: robotests and visual verified
1) Open Settings app
2) Click on any entrypoint
3) Observe and see if there's a flick problem on app bar title

Change-Id: I9f5b7cdd163f20dd7f85cf2f83b9ef01a473dd3c
2021-03-09 15:10:22 +08:00
Edgar Wang
3f051ac871 Merge "Refactor MainSwitchBar" into sc-dev 2021-03-09 06:34:44 +00:00
Arc Wang
12d9d5e85a Change ScrollView to NestedScrollView for wifi_dialog
After enabling collapsing toolbar, ScrollView is not working with
CoordinatorLayout. So we need to update it to NestedScrollView to make
it work with CoordinatorLayout.

Bug: 182221182
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=com.android.settingslib.wifi
      manual visual
      In Settings -< Network & internet -> Wi-Fi -> Add network,
      select enterprise type and scroll the screen.
Change-Id: Ie9de753ee198409275e818a123b5ba7f9b6a1e26
2021-03-09 14:25:37 +08:00