TreeHugger Robot
486d43bcb5
[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b am: ebb056faff -s ours am: d53c640946 -s ours
...
am skip reason: Change-Id I657de039d667f5aee0941336e9361ae04f056c33 with SHA-1 159bd0e966 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id979960d9f56499be6f6e77566767c9c95f32537
2021-03-08 15:47:07 +00:00
Menghan Li
e3a267bde3
Merge "Update accessibility settings layout" into sc-dev am: d4657b4c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d7b4df81637f16a69892c37b8c89ca6724428c9
2021-03-08 15:44:45 +00:00
TreeHugger Robot
d53c640946
[automerger skipped] Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b am: ebb056faff -s ours
...
am skip reason: Change-Id I657de039d667f5aee0941336e9361ae04f056c33 with SHA-1 159bd0e966 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b46618c94d1f4a0ed852f5f66d04cf57c3d7f13
2021-03-08 15:08:25 +00:00
Menghan Li
d4657b4c6b
Merge "Update accessibility settings layout" into sc-dev
2021-03-08 14:54:21 +00:00
TreeHugger Robot
ebb056faff
Merge "Fix security issue" into rvc-qpr-dev am: 2c61777f4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0e6becb72af1141d8cbcd814a55d34b4a171b1b
2021-03-08 14:26:28 +00:00
TreeHugger Robot
2c61777f4b
Merge "Fix security issue" into rvc-qpr-dev
2021-03-08 13:43:50 +00:00
menghanli
5f04aa0c52
Update accessibility settings layout
...
Accessibility settings category restructure
1. Add Color Inversion into Text and Display page
2. Move High contrast text to the last item
3. Move Dark theme and Reduce Brightness to the top Accessibility page
4. Remove the turn screen darker entry point
Bug: 174829936
Test: atest AccessibilitySettingsTest
Change-Id: I3e0c222d57e49db3a551010fa7dc1c7b5b3a9e2c
2021-03-08 09:25:52 +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
TreeHugger Robot
ccf52aa571
Merge "Change ScrollView to NestedScrollView for language list" into sc-dev am: a87ab24b07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774519
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a3ed691d7d116fbfeabcdb6034a4298c0e6355b
2021-03-08 08:24:02 +00:00
Jeremy Goldman
6e1b791342
Merge "PhoneNumberPreferenceControllerTest converted to JUnit"
2021-03-08 08:08:34 +00:00
TreeHugger Robot
a87ab24b07
Merge "Change ScrollView to NestedScrollView for language list" into sc-dev
2021-03-08 08:07:06 +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
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
dc3888a9c5
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: I8b708b995256fdcc50be69a6679756621155e60b
2021-03-08 06:27:39 +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
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
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
Weng Su
db37f2e48e
[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: Ie21a66a79e67bbcc9ea2b1ca56d8944101d6fd08
2021-03-07 04:08:31 +00:00
Weng Su
d2c2c9927a
[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: Ibc9804aa492679117924465cdc69dc605edc2c34
2021-03-07 04:08:22 +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
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
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
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
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
Mill Chen
256c8501c0
Change ScrollView to NestedScrollView for language list
...
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: 181737215
Test: visual verified
1) Settings -> System -> Languages & input -> Languages
2) Add 6-8 languages to the list
3) Scrolling the list to see if it's smooth
Change-Id: Id47dfc225585ddd4469838ff0898495cda3f6c44
2021-03-05 22:52:55 +08: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