Commit Graph

35665 Commits

Author SHA1 Message Date
Salud Lemus
a1be92dcd8 Merge "Update Action Not Allowed Dialog text for a financed device" into sc-dev am: 50527b1f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13733826

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3182044e6e28bcaa5dd60f084c91fe1dc61acee9
2021-03-08 21:25:53 +00:00
Salud Lemus
50527b1f63 Merge "Update Action Not Allowed Dialog text for a financed device" into sc-dev 2021-03-08 21:08:52 +00:00
Salud Lemus
b45d87715a Update Action Not Allowed Dialog text for a financed device
Bug: 173826319
Bug: 158157476
Test: Used a test device that is registered via ZT
Test: m RunSettingsRoboTests ROBOTEST_FILTER=ActionDisabledByAdminDialogHelperTest

Change-Id: Iefeb0b653764952e409dfd862d9cc54c4f5e7fc9
2021-03-08 19:06:13 +00:00
Victoria Lestari
a36e8bfdbe Merge "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"" into sc-dev am: fc037c26dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13785873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaca93afb807422e8803880008d5462da9623ee5d
2021-03-08 18:04:55 +00:00
Victoria Lestari
fc037c26dd Merge "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"" into sc-dev 2021-03-08 17:39:23 +00:00
Victoria Lestari
9516314de4 Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"
This reverts commit 765edb60a3.

Reason for revert: b/182170686

Change-Id: I4e1551bed44b22b12541e92a4d940ec131a1ff34
2021-03-08 17:36:18 +00:00
Victoria Lestari
991c88b22d Merge "VoiceInputHelper should not show recognition service if it's not selectable as default" into sc-dev am: 026854ea4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740889

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc1902ba70e4743e9789b053025872ce932a557b
2021-03-08 17:02:28 +00:00
Victoria Lestari
026854ea4c Merge "VoiceInputHelper should not show recognition service if it's not selectable as default" into sc-dev 2021-03-08 16:34:22 +00:00
TreeHugger Robot
fb45e0751b Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev am: 0b29ebd420
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fcfa67e30fd3e39c34d1baa73c4c45523631434
2021-03-08 09:11:06 +00:00
TreeHugger Robot
0b29ebd420 Merge "Update FingerprintEnrollFindSensor for landscape" into sc-dev 2021-03-08 08:46:12 +00:00
Jeremy Goldman
6e1b791342 Merge "PhoneNumberPreferenceControllerTest converted to JUnit" 2021-03-08 08:08:34 +00:00
TreeHugger Robot
d071eb87d1 Merge "Fix NPE crash during setup flow" into sc-dev am: fc6e9c8e40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13779503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I581c6f966860fec099e42311adce55731382814d
2021-03-08 08:04:52 +00:00
Ahaan Ugale
74310265fe Merge "OWNERS for autofill and assist settings." am: 7af352dc73 am: 6d5dc7b451 am: 3879729cd1 am: fbddfeba11
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I839af460c29ee2547c905e75048d25737283e263
2021-03-08 08:04:42 +00:00
TreeHugger Robot
fc6e9c8e40 Merge "Fix NPE crash during setup flow" into sc-dev 2021-03-08 07:56:56 +00:00
Ahaan Ugale
fbddfeba11 Merge "OWNERS for autofill and assist settings." am: 7af352dc73 am: 6d5dc7b451 am: 3879729cd1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f3f2d73b50b2eb91a94853e62350df72264686e
2021-03-08 07:49:18 +00:00
Trevor Black
0c902eecf3 Merge "Add Extra App Info into Settings App UI." into sc-dev am: c6a359a2a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13587962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83c51d906f1618732805fe79a321713bee51ae2d
2021-03-08 07:39:38 +00:00
Mill Chen
f97df931df Update FingerprintEnrollFindSensor for landscape
SUW library can support landscape mode. It reuse the portrait layout to
render the screen for landscape. So we don't need to have a layout for
it. This change is to move the description to a subtitle and remove the
unused layout.

Bug: 179234361
Bug: 171294253
Bug: 179317709
Test: visual verified
Change-Id: Icfb3be799c1b4e190691731638aaa3467cadf624
2021-03-08 15:27:03 +08:00
Ahaan Ugale
3879729cd1 Merge "OWNERS for autofill and assist settings." am: 7af352dc73 am: 6d5dc7b451
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb4accc78e211a45df173186defaca5634aa1b29
2021-03-08 07:06:26 +00:00
Trevor Black
c6a359a2a5 Merge "Add Extra App Info into Settings App UI." into sc-dev 2021-03-08 07:04:42 +00:00
Weng Su
d3e90e92d4 Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev am: 5c82ddf075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2179d2900be82ad280b0b881569d555a44564dd
2021-03-08 06:27:22 +00:00
Mill Chen
873d5ef6f5 Fix NPE crash during setup flow
The sud_layout_description text view has been removed and being replaced
with a subtitle of GlifLayout. This is why Settings crash during setup
flow. Removing the text view and putting the string in the right place
can fix this issue.

Fixes: 182095350
Test: robotest
Change-Id: I05ea6fe5a404a20a46cf17ab212e6f736a119fe4
2021-03-08 14:02:33 +08:00
Weng Su
5c82ddf075 Merge "[Provider Model] Add Wi-Fi toggle" into sc-dev 2021-03-08 05:57:06 +00:00
Yomna Nasser
90e7e5f728 Merge "Add metrics to Enable2gPreferenceController." into sc-dev am: b6042cec85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13743650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb6c15f97700fd490f42f011b99e387722187782
2021-03-07 04:14:15 +00:00
Ahaan Ugale
43344a918a Merge "AF: Show passwords settings for available autofill service." into sc-dev am: 1d1f3ea85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13723064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb4fbf73b3057fb59172c28977235578cb0864d5
2021-03-07 04:00:47 +00:00
Ahaan Ugale
1014194897 OWNERS for autofill and assist settings.
tests/unit/../autofill is empty here; new files are being added in the
internal repo.

Change-Id: Ia4aaa395b01147ee0597cca6075aae0121de7dd9
Test: n/a
2021-03-07 00:40:15 +00:00
Yomna Nasser
b6042cec85 Merge "Add metrics to Enable2gPreferenceController." into sc-dev 2021-03-05 22:26:49 +00:00
Ahaan Ugale
1d1f3ea85f Merge "AF: Show passwords settings for available autofill service." into sc-dev 2021-03-05 20:16:53 +00:00
TreeHugger Robot
b876f4f418 Merge "NLS settings polish" into sc-dev am: 78e8175479
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13787325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4b488a43131fc6c8b9ab8334519045007be73ac
2021-03-05 19:57:28 +00:00
TreeHugger Robot
78e8175479 Merge "NLS settings polish" into sc-dev 2021-03-05 19:11:47 +00:00
Zoey Chen
290ee6aa36 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev am: d841a36c6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660509

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc74834fa439257a2ff1c6e82d5c15cc3b777793
2021-03-05 15:04:33 +00:00
TreeHugger Robot
d9b063428e Merge "Update new consent screen for fingerprint" into sc-dev am: e2410263f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774726

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I391dd20f56d11af681a94e5758516f3a54652a09
2021-03-05 15:04:01 +00:00
Zoey Chen
d841a36c6f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev 2021-03-05 14:43:52 +00:00
TreeHugger Robot
e2410263f2 Merge "Update new consent screen for fingerprint" into sc-dev 2021-03-05 14:29:45 +00:00
Julia Reynolds
8aaa9b1b24 NLS settings polish
- Update strings
- Link to NLS page from notifications
- And fix an ordering issue on that page

Test: manual
Fixes: 181855978
Fixes: 181125178
Change-Id: I93d975763326d1e6d0cd02887abc515ad55329d0
2021-03-05 14:27:51 +00:00
TreeHugger Robot
e1dcf60cfd Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev am: 8c96038584
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49319ff9b78c970e2059bf0dcf1f5a703c4c6180
2021-03-05 14:08:49 +00:00
TreeHugger Robot
8c96038584 Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev 2021-03-05 13:58:28 +00:00
Wesley Wang
892cf9808e Merge "Update Battery Settings main page (1/2)" into sc-dev am: 783f1b1b56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib43d0b03cf4f9618a45b154eea51d21c0de46227
2021-03-05 11:55:47 +00:00
Wesley Wang
783f1b1b56 Merge "Update Battery Settings main page (1/2)" into sc-dev 2021-03-05 11:23:39 +00:00
TreeHugger Robot
96324ec3a3 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec5873050d56edd21763a467766a80e844ba7dfe
2021-03-05 10:15:32 +00:00
TreeHugger Robot
2aa8d2b437 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev 2021-03-05 09:53:05 +00:00
Weng Su
edebd02b0a [Provider Model] Add Wi-Fi toggle
- Network & internet Settings
  - Remove “Show airplane mode networks"

- Internet Settings
  - Add “Wi-Fi” switch preference
    - Show “Find and connect to Wi-Fi networks” in summary

- Screenshot:
  https://screenshot.googleplex.com/AnoXf4qDe2jPirP

Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
         WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
2021-03-05 16:32:06 +08:00
Mill Chen
c2be31a7d3 Update new consent screen for fingerprint
- Move top description into subtitle for landscape mode
- Update the button text

Bug: 177591560
Test: robotest and visual verified
1) Settings -> Security -> Fingerprint
2) Rotate the device and check if the description is on the right side

Change-Id: Ie20597fce48f73aa83c5d637682db1860c384a7a
2021-03-05 15:53:01 +08:00
Jason Hsu
c022defb32 Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ...
* changes:
  Add seekBar properties 'tickMark' to LabeledSeekBarPreference
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
2021-03-05 06:40:06 +00:00
Wesley.CW Wang
280e3639cd Update Battery Settings main page (1/2)
- Rollback ag/13413813 to meet the design change
 - Regrouping the index
 Screenshots:
   https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
   https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
2021-03-05 06:03:42 +00:00
Ahaan Ugale
a5571da12b AF: Show passwords settings for available autofill service.
Separates autofill preferences into 2 categories - one for the passwords
settings and one for the existing default service preference.

The passwords preference controller dynamically creates preferences for
each autofill service.

Bug: 169455298
Test: manual
Test: TODO new test for controller
Change-Id: I369b5db00be75957c869df4d960595e9e1d9772c
2021-03-04 21:49:42 -08:00
Janis Danisevskis
bb5ebce8a0 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4395ebf453fd712d9870580a90c370b42a770d7a
2021-03-05 05:41:50 +00:00
SongFerng Wang
cc1715e2c0 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
2021-03-05 05:17:42 +00:00
Tom Hsu
3bc9bcdae2 Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
2021-03-05 04:53:46 +00:00
Abel Tesfaye
50e41300a9 Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev am: 61aa289dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13714687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70ce193ba057b981dc39ec1b5165fa1afa5ef416
2021-03-05 04:53:02 +00:00
TreeHugger Robot
ef509128d5 Merge changes from topic "jr_device" into sc-dev am: dd6255a653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
2021-03-05 04:50:43 +00:00