Commit Graph

79953 Commits

Author SHA1 Message Date
TreeHugger Robot
39b23a3aa8 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: Iab1d3998930d3ab424f339e967cf0886e7fdf548
2021-03-10 12:15:56 +00:00
Ahaan Ugale
35f0c68a09 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: I9188f577bd108baf0c17255c376f4156188c1e01
2021-03-10 12:15:51 +00:00
Trevor Black
482f772329 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: Id237f0f3c631f4a0bcf1ddc21180decfe0f7a782
2021-03-10 12:15:38 +00:00
TreeHugger Robot
d1366fce52 Merge "Add a missing string for new Intent Picker" into sc-dev am: f2bbadf57b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaad33d08e5e4bc14134c969c11e71ad8ebab06e1
2021-03-10 11:08:04 +00:00
Weng Su
38db749677 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: Ie83fff6eae71542d0d10dd554653572d59b95bd9
2021-03-10 11:07:57 +00:00
Yomna Nasser
a41ceaf67a 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: I45e7b17fb8fa0e31d527f399ef3c7df941db099b
2021-03-10 11:07:43 +00:00
Weng Su
a8b49a8d69 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours am: 354bdce86b -s ours am: 41c1e71b0b -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b8a124458d3f1017af7fdaa54876fdfca3dc3b2
2021-03-10 11:06:38 +00:00
Weng Su
7220095e95 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours am: 01961e9e11 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I368f444875b6ff7c54cd78ca38b7869a9076659c
2021-03-10 11:06:32 +00:00
Ahaan Ugale
b622520209 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: I0c1ddc3fd8ae02cbf6ef2cc16fb6ba3123b23cd8
2021-03-10 11:05:56 +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
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
Ahaan Ugale
6d5dc7b451 Merge "OWNERS for autofill and assist settings." am: 7af352dc73
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba9dab65368e117fded8d1ff93455c274fffcaa0
2021-03-08 06:31:53 +00:00
TreeHugger Robot
f2bbadf57b Merge "Add a missing string for new Intent Picker" into sc-dev 2021-03-08 06:07:59 +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
Ahaan Ugale
7af352dc73 Merge "OWNERS for autofill and assist settings." 2021-03-08 05:47:48 +00:00
Sunny Shao
1799258ecb Add a missing string for new Intent Picker
- Add the "Opens in" that was missed in last Intent Picker submit.

bug: 177923646
Test: compilation
Change-Id: I40a2bdbf282dd5c9cc325e80772d355192ef9002
2021-03-08 02:46:25 +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
Weng Su
41c1e71b0b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours am: 354bdce86b -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69d2291b6267b149d31c3cf18257d774ce2fff3a
2021-03-05 21:37:42 +00:00
Weng Su
01961e9e11 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba00bfb17a2256c08a88356337dccfa58e4f651
2021-03-05 20:58:49 +00:00
Weng Su
354bdce86b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib60fc2fd5e2e16815f0aa60e6b542867855f2996
2021-03-05 20:54:51 +00:00
Weng Su
422280c10d [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad0d4683f21d80027e0891b1d14c1dd6b71245f
2021-03-05 20:19:15 +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
Weng Su
1f234b3791 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic08627d137adc378004da05adf8945c9f7b38b0a
2021-03-05 20:14:51 +00:00
TreeHugger Robot
cf06dfaf7a 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: Id33ed2d21873e0057ff29ed3a41b1bfe5ef66de0
2021-03-05 20:00:03 +00:00
Weng Su
8aa56318f8 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7896b97e36005b6f3b28f448a2e2ede6d373259f
2021-03-05 19:39:23 +00:00
TreeHugger Robot
78e8175479 Merge "NLS settings polish" into sc-dev 2021-03-05 19:11:47 +00:00
Weng Su
385b5cafd2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae7ce98bd42db5528d78be0e8a72b86a5de9ee9
2021-03-05 18:44:22 +00:00
Weng Su
efb2543e93 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
2021-03-05 18:12:04 +00:00
Zoey Chen
98a2018ad1 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: I07b655fb9287472d9c3d6e9e38a153380b33c232
2021-03-05 15:05:32 +00:00
TreeHugger Robot
dba88408a6 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: I25ced7b5b6e0d3a92422fb559b80ef899fb89dc0
2021-03-05 15:04:24 +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
48cb098576 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: Ia93bc91846fc3cd5e6db77b9e35f26f2cdd06be6
2021-03-05 14:09:00 +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
a3b0bf6612 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: I84bd637ad484cff14bf411c5453c839859911faa
2021-03-05 11:56:16 +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
1ce08cbe8f 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: I256fd63330ba547cdd280ce6423c72a282253e9a
2021-03-05 10:15:58 +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
Weng Su
72b8284ced [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours am: 6887ea151a -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida1fd1547a60cbcbd2e9a3e4bcc5a2ed0901ea1f
2021-03-05 07:23:17 +00:00
Weng Su
6887ea151a [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I915bbd72bc7737c9bd53fac1bca98f18fc61fe8a
2021-03-05 07:08:25 +00:00
TreeHugger Robot
e55293815e Merge "Add strings for new Intent Picker" into sc-dev am: 0a6a65d8d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2e8d583e39dafcee7ed61d31a2291c3b1dcefd2
2021-03-05 06:36:44 +00:00
Weng Su
fb6947cdf7 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours am: 3fb9083a66 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ef1a439a271ce64d7900fd4aa73a4d9fa37e42
2021-03-05 06:36:38 +00:00
TreeHugger Robot
baf7af921c [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: f0c01c5368 -s ours am: 3f925449c7 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c0529724710cafae0fa9976bf90d90879d5cd89
2021-03-05 06:36:31 +00:00