PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,546 Commits 1 Branch 0 Tags
e8af88794f198e51acc05a92d0a01df366de511c
Commit Graph

80546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
7dc9ea1573 [automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b am: 6003cb977f am: 9988792138 -s ours am: 0872d40a75 -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: I7ebbb6f675ec25e6c09f46e874ae1e24da1c8728
 2021-03-09 13:06:31 +00:00
TreeHugger Robot
b60800a7a1 Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev am: be1b2f307d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb722d9241905887ee31a313444999cd05c151bb
 2021-03-09 13:06:05 +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
TreeHugger Robot
de407c9af1 Merge "Prevent app bar title from drawing twice" into sc-dev am: 50129cc4db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bc2a8e201e3e2e1b42155dee8646a5986b0c8e5
 2021-03-09 09:45:09 +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
7eda5e7f0a Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev am: 3dacd0209c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13812549

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2efd20f994c0bf4b74f86c33e3cbeb2624db6f2a
 2021-03-09 08:08:25 +00:00
TreeHugger Robot
75cf35b175 Merge "Update fingerprint layouts for landscape" into sc-dev am: 6ef1bc7336 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13806600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I431a235819ea7e4e8be12e59dcb370f9d35a3281
 2021-03-09 08:07:41 +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
96a33dd747 Merge "Refactor MainSwitchBar" into sc-dev am: 3f051ac871 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13566507

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49b3852c999e62766236d1a61d42431f782726b7
 2021-03-09 06:47:58 +00: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
TreeHugger Robot
4aaa7b120d Merge "Move injected services for work into a new page" into sc-dev am: 3b477b13e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13791190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I080e5d5b1f8eb9e92392bb0062c4866ebbe90398
 2021-03-09 05:12:45 +00:00
Jeremy Goldman
71a33717b8 Merge "SerialNumberPreferenceControllerTest converted to JUnit" 2021-03-09 05:00:08 +00:00
TreeHugger Robot
3b477b13e1 Merge "Move injected services for work into a new page" into sc-dev 2021-03-09 04:25:18 +00:00
TreeHugger Robot
9f9ca154f1 Merge "Add "See All" page for Recent Location Access" into sc-dev am: f605777f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775472

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d9ce0ab3f3338c5cdb24e448a5a558e1059ae89
 2021-03-09 03:43:40 +00:00
Paul Hu
665ed9f8cb Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev am: e5e60115db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13794937

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7016832c402b3a01e2593902f901f6d8bbcadb8e
 2021-03-09 03:43:18 +00:00
TreeHugger Robot
5e9bf196cb Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev am: 6535fe00c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13805368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bc1403667f0c7c48bfb0838a2c6106d9b507963
 2021-03-09 03:41:32 +00:00
TreeHugger Robot
f605777f10 Merge "Add "See All" page for Recent Location Access" into sc-dev 2021-03-09 03:36:56 +00:00
Paul Hu
e5e60115db Merge "Update Utils#getTetheringLabel usage on Settings" into sc-dev 2021-03-09 03:33:01 +00:00
TreeHugger Robot
6535fe00c7 Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev 2021-03-09 03:07:42 +00:00
Edgar Wang
7eeca8bc65 Refactor MainSwitchBar 
- Extract RestrictedLockUtils related things to SettingsMainSwitchBar

Bug: 180226735
Test: robotest
Change-Id: I694cdb181c137bd2f22cc1d4e466f7e203f8c0e2
 2021-03-09 03:02:05 +00:00
Kevin Chyn
54619b5c63 Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev am: 5dca77291b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13792643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3db63522f291968c5ebb169d81f0b584c016f5eb
 2021-03-09 02:37:40 +00:00
Kevin Chyn
5dca77291b Merge "Do not re-start fingerprint auth if ERROR_USER_CANCELED" into sc-dev 2021-03-09 02:26:15 +00:00
Alex Salo
9ddae00513 Merge "Fix long press auto rotate implementation bug" into sc-dev am: 8bfbd34662 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I144c7878daa2270954c6f6bcdff091504bbc9e32
 2021-03-09 00:38:53 +00:00
Alex Salo
8bfbd34662 Merge "Fix long press auto rotate implementation bug" into sc-dev 2021-03-09 00:15:43 +00:00
Michael Wachenschwanz
3223845b89 Merge "Update FakeUid with energy to charge change" into sc-dev am: 8625648a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13598823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9191d52864deb309c878c616a5bcc18df1c8f7c9
 2021-03-08 23:58:17 +00:00
Michael Wachenschwanz
8625648a88 Merge "Update FakeUid with energy to charge change" into sc-dev 2021-03-08 23:46:08 +00:00
Mill Chen
7cd08b6aa2 Update fingerprint layouts for landscape 
- Refine the portrait layout to be reused for landscape
- Add strings for UDFPS enrollment
- Remove the landcaspe layout since it is no longer used.

Fixes: 171294253
Test: visual verified
Change-Id: Ibbfa5515437e2c2a348db9b621b4e60ba922a383
 2021-03-09 06:14:27 +08:00
Yu-Han Yang
b04a984813 Move injected services for work into a new page 
Screenshots: http://shortn/_0BiBfpkHfh

Bug: 180533061
Test: on device
Change-Id: Ie488c80856b4c4cc67789b8239005f6001ed9d87
 2021-03-08 13:31:34 -08:00
Yu-Han Yang
cdb3551be1 Add "See All" page for Recent Location Access 
Screenshots: http://shortn/_UPy8KFSeSj

Bug: 180533061
Test: manual on device
Change-Id: Ib77bc0705835520ed1a2d3b7f662088ed838e53e
 2021-03-08 13:27:45 -08:00
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
TreeHugger Robot
8924635d26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5f2befdb4f -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750d515ae84413c97ec846a09290e56698853a22
 2021-03-08 21:25:40 +00:00
TreeHugger Robot
0ddd0cc5af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 082d84d63d -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic567e1be5679c41a244d3298a69f71516df8eba8
 2021-03-08 21:22:33 +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
Abel Tesfaye
a390dc9a42 Fix for NPE in ScreenTimeoutSettingsTest 
Test: make RunSettingsRoboTests -j54 ROBOTEST_FILTER=ScreenTimeoutSettings

Bug: 182149244
Change-Id: I22e15c84fa6b0864d35f79df015f1d5b86dec24b
 2021-03-08 21:06:26 +00:00
TreeHugger Robot
5f2befdb4f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-08 20:59:06 +00:00
TreeHugger Robot
082d84d63d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-08 20:53:45 +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
de0bfdb32a Revert "Revert "VoiceInputHelper should not show recognition service if it's not selectable as default"" 
This reverts commit 9516314de4.

Reason for revert: I submitted ag/13740889 too early. Now that ag/13700299 has been submitted, I want to re-submit this change.

Bug: 175429607

Tested: on device

Change-Id: Iac1363ca4745636b8133f38fcc43e77444c6c1e6
 2021-03-08 18:13:09 +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