OSDN Git Service

android-x86/packages-apps-Settings.git
4 years ago[Wi-Fi] Release the camera before opening
Arc Wang [Mon, 21 Oct 2019 06:37:38 +0000 (14:37 +0800)]
[Wi-Fi] Release the camera before opening

As per the Google's design mentioned at
https://developer.android.com/training/camera/cameradirect.html
Calling Camera.open() throws an exception
if the camera is already in use by another application,
so we wrap it in a try block one must release the camera before opening

Bug: 141662635
Test: Manual occurs once while testing 10 times
1.Open wifi settings,tap QR code icon
2.Make a incoming VoLTE call,tap incoming VoLTE call dialog
3.Check device
Signed-off-by: JeiFeng Lee <linger.lee@mediatek.com>
Change-Id: Ief62600af8b745cb4eae2e5ae277a2cebdda68eb

4 years agoMerge "[Setting] Cleanup Unused SimSettings"
Bonian Chen [Sun, 20 Oct 2019 13:16:29 +0000 (13:16 +0000)]
Merge "[Setting] Cleanup Unused SimSettings"

4 years ago[Setting] Cleanup Unused SimSettings
Bonian Chen [Wed, 16 Oct 2019 11:20:14 +0000 (19:20 +0800)]
[Setting] Cleanup Unused SimSettings

There's no entry to access SimSettings.
Remove this unused UI.

Bug: 131324863
Test: manual
Change-Id: I3f50e528eb409215371a125184502d3531bad0a8

4 years ago[automerger skipped] Import translations. DO NOT MERGE am: 476d82715a -s ours
Bill Yi [Sat, 19 Oct 2019 12:07:15 +0000 (05:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 476d82715a -s ours
am: e127092dfd -s ours
am skip reason: subject contains skip directive

Change-Id: I6dfac82dc352d47356ae02d636f6c3a54555a6ae

4 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Sat, 19 Oct 2019 11:56:30 +0000 (04:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 476d82715a -s ours
am skip reason: subject contains skip directive

Change-Id: I22006097e4ff21843030e9bac2138c9d2c5b56f3

4 years agoMerge "[Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged"
Arc Wang [Sat, 19 Oct 2019 11:05:26 +0000 (11:05 +0000)]
Merge "[Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged"

4 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 19 Oct 2019 07:50:29 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import

4 years ago[Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged
Arc Wang [Fri, 18 Oct 2019 10:09:19 +0000 (18:09 +0800)]
[Wi-Fi] Updates internal AccessPoint list upon onAccessPointsChanged

Updating access point list requires WifiTracker's AccessPoints and
WifiNetworkFactory's matching scan results. When WifiNetworkFactory
sends the matching scan results to NetworkRequestDialogFragment, if
WifiTracker still does not receive scan results, UI will not be
updated.
This CL is to update internal AccessPoint list from WifiTracker
upon onAccessPointsChanged callback to reflect results properly.

Bug: 140600730
Test: manual, robotests
Change-Id: I0f9814821b3d56f3c55f1e6419c8b7a03b03589e
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
4 years agoMerge "Move Emergency call button" am: 2501f6e268 am: 251411674b am: 32f4f10d4a
Anamika Singh [Fri, 18 Oct 2019 09:08:58 +0000 (02:08 -0700)]
Merge "Move Emergency call button" am: 2501f6e268 am: 251411674b am: 32f4f10d4a
am: c455762580

Change-Id: I70e9fd65f94257d7ab2a254a8b2d703df5e2031b

4 years agoMerge "Move Emergency call button" am: 2501f6e268 am: 251411674b
Anamika Singh [Fri, 18 Oct 2019 09:01:54 +0000 (02:01 -0700)]
Merge "Move Emergency call button" am: 2501f6e268 am: 251411674b
am: 32f4f10d4a

Change-Id: I5457a7f278db3a87a22696d0a698a5aaf861e148

4 years agoMerge "[Wi-Fi] [a11y] The "Advanced options" should be accessible by Voice Access...
Goven Liu [Fri, 18 Oct 2019 09:00:07 +0000 (09:00 +0000)]
Merge "[Wi-Fi] [a11y] The "Advanced options" should be accessible by Voice Access and pronounced by talkback correctly."

4 years agoMerge "Move Emergency call button" am: 2501f6e268
Anamika Singh [Fri, 18 Oct 2019 08:55:53 +0000 (01:55 -0700)]
Merge "Move Emergency call button" am: 2501f6e268
am: 251411674b

Change-Id: I97e20041d520f2795affe8c66e1d12e16ec5cfde

4 years agoMerge "Move Emergency call button"
Anamika Singh [Fri, 18 Oct 2019 08:49:54 +0000 (01:49 -0700)]
Merge "Move Emergency call button"
am: 2501f6e268

Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f

4 years agoMerge "Move Emergency call button"
Treehugger Robot [Fri, 18 Oct 2019 08:37:39 +0000 (08:37 +0000)]
Merge "Move Emergency call button"

4 years agoChange Panels creation interface to take a bundle
Raff Tsai [Fri, 18 Oct 2019 04:51:28 +0000 (12:51 +0800)]
Change Panels creation interface to take a bundle

Fixes: 124399577
Test: robolectric
adb shell am start -a android.settings.panel.action.WIFI
adb shell am start -a android.settings.panel.action.VOLUME

Change-Id: I9e13357444e4ebeee50fb8cc68fbc974ce5fffb6

4 years agoMerge "Hide search box if it is called in initial setup wizard"
TreeHugger Robot [Fri, 18 Oct 2019 04:00:32 +0000 (04:00 +0000)]
Merge "Hide search box if it is called in initial setup wizard"

4 years agoHide search box if it is called in initial setup wizard
Raff Tsai [Fri, 18 Oct 2019 01:57:49 +0000 (09:57 +0800)]
Hide search box if it is called in initial setup wizard

- Search box is hidden if user set intent extra isSetupFlow true

Fixes: 135717823
Test: search box is hidden in the following command
adb shell am start -a android.settings.SETTINGS --ez isSetupFlow true

Change-Id: Ia3d955c9390d6b0eef9391b9b35b6a483eb63d26

4 years agoSwitch to new internal API
Philip P. Moltmann [Fri, 23 Aug 2019 22:58:48 +0000 (15:58 -0700)]
Switch to new internal API

Test: atest RunSettingsRoboTests
Change-Id: I2ecfa651031bcb431f28d55512cf93c442686d71

4 years ago[Wi-Fi] [a11y] The "Advanced options" should be accessible by Voice Access and pronou...
govenliu [Thu, 17 Oct 2019 07:57:57 +0000 (15:57 +0800)]
[Wi-Fi] [a11y] The "Advanced options" should be accessible by Voice Access and pronounced by talkback correctly.

The checkbox is unclickable via Accessibility.

Solution: Refine the solution of b/30079196 to let checkbox be focusable and clickable by Accessibility, and remove unnecessary Accessibility pronunciation strings.

Bug: 141588638
Bug: 141588161
Test: Add unit test to check the content description of the checkbox.
Change-Id: I2e7932f64ae29a13b793276eab6705009af20104

4 years agoMerge "Update the logic of querying crashed a11y services"
Jackal Guo [Thu, 17 Oct 2019 06:21:11 +0000 (06:21 +0000)]
Merge "Update the logic of querying crashed a11y services"

4 years agoMerge "Fix non responding slice toggling problem." into qt-qpr1-dev am: 5956f903cb
Yi-Ling Chuang [Thu, 17 Oct 2019 04:32:12 +0000 (21:32 -0700)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev am: 5956f903cb
am: e87289bbc4

Change-Id: I7cea63639e03070d6aee1eeaf82214bc5f4328b6

4 years agoMerge "Fix non responding slice toggling problem." into qt-qpr1-dev
Yi-Ling Chuang [Thu, 17 Oct 2019 04:09:58 +0000 (21:09 -0700)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
am: 5956f903cb

Change-Id: I2235eeb55d9ebcaaac399956d854471779c23b31

4 years agoMerge "Fix crash on indexing AccountWorkProfileDashboardFragment"
Raff Tsai [Thu, 17 Oct 2019 01:38:11 +0000 (01:38 +0000)]
Merge "Fix crash on indexing AccountWorkProfileDashboardFragment"

4 years agoMerge "Fix non responding slice toggling problem." into qt-qpr1-dev
TreeHugger Robot [Thu, 17 Oct 2019 01:32:14 +0000 (01:32 +0000)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev

4 years agoMerge "Enforce policy management."
Joshua Mccloskey [Wed, 16 Oct 2019 23:23:27 +0000 (23:23 +0000)]
Merge "Enforce policy management."

4 years agoMerge "Password constraints cleanup."
Pavel Grafov [Wed, 16 Oct 2019 17:49:12 +0000 (17:49 +0000)]
Merge "Password constraints cleanup."

4 years agoPassword constraints cleanup.
Pavel Grafov [Wed, 7 Aug 2019 12:21:53 +0000 (13:21 +0100)]
Password constraints cleanup.

Unified password validation code between DPMS and Settings.

Bug: 138375712
Test: atest tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
Change-Id: I55e4dae47526659594af3fcdbfc1292edceb5807

4 years agoMerge "Add BooleanState metadata to DevelopmentTiles"
Fabian Kozynski [Wed, 16 Oct 2019 13:07:50 +0000 (13:07 +0000)]
Merge "Add BooleanState metadata to DevelopmentTiles"

4 years agoMerge "Fix talkback will not speak correct status"
TreeHugger Robot [Wed, 16 Oct 2019 12:25:02 +0000 (12:25 +0000)]
Merge "Fix talkback will not speak correct status"

4 years agoFix crash on indexing AccountWorkProfileDashboardFragment
Tsung-Mao Fang [Wed, 16 Oct 2019 11:13:46 +0000 (19:13 +0800)]
Fix crash on indexing AccountWorkProfileDashboardFragment

This feature is not ready, We should not index this fragment now.

Change-Id: I127d00069846f39e8faaae0c8d099463af0718ed
Fix: 142780476
Test: rebuilt

4 years agoMerge "Fix NPE when user goes from none to swipe for lockscreen"
TreeHugger Robot [Wed, 16 Oct 2019 11:17:57 +0000 (11:17 +0000)]
Merge "Fix NPE when user goes from none to swipe for lockscreen"

4 years agoMerge "Adds cross-profile intents for Bluetooth detail Settings"
TreeHugger Robot [Wed, 16 Oct 2019 09:58:21 +0000 (09:58 +0000)]
Merge "Adds cross-profile intents for Bluetooth detail Settings"

4 years agoMerge "[Wi-Fi] Refine code for saved AccessPoints"
TreeHugger Robot [Wed, 16 Oct 2019 08:55:30 +0000 (08:55 +0000)]
Merge "[Wi-Fi] Refine code for saved AccessPoints"

4 years agoMerge "[Wi-Fi] Fix Wi-Fi hotspot two line summary UI problem"
TreeHugger Robot [Wed, 16 Oct 2019 08:44:32 +0000 (08:44 +0000)]
Merge "[Wi-Fi] Fix Wi-Fi hotspot two line summary UI problem"

4 years agoMerge "Update string"
TreeHugger Robot [Wed, 16 Oct 2019 08:43:50 +0000 (08:43 +0000)]
Merge "Update string"

4 years agoMerge "Add metrics and code change for magnification dialog"
Kevin Chang [Wed, 16 Oct 2019 08:12:47 +0000 (08:12 +0000)]
Merge "Add metrics and code change for magnification dialog"

4 years agoMerge "Change string of switchbar and installed service category title"
Kevin Chang [Wed, 16 Oct 2019 08:12:38 +0000 (08:12 +0000)]
Merge "Change string of switchbar and installed service category title"

4 years ago[Wi-Fi] Fix Wi-Fi hotspot two line summary UI problem
Arc Wang [Mon, 14 Oct 2019 08:10:07 +0000 (16:10 +0800)]
[Wi-Fi] Fix Wi-Fi hotspot two line summary UI problem

Use summary_placeholder instead of summary_two_lines_placeholder.

Bug: 131985486
Test: visual
Change-Id: I7ebac1fcbcbe23dec0c624a75a7cb4fecf537a57

4 years ago[Wi-Fi] Refine code for saved AccessPoints
Arc Wang [Mon, 14 Oct 2019 02:32:57 +0000 (10:32 +0800)]
[Wi-Fi] Refine code for saved AccessPoints

SubscribedAccessPointsPreferenceController extends from
SavedAccessPointsPreferenceController to remove duplicate
code.

Bug: 127206629
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints
      Manual: Add and forget Wi-Fi accesspoints and observe UI display.

Change-Id: Ia494117ae98f043ce65b2f9f6e4b4daccc8df543

4 years agoAdds cross-profile intents for Bluetooth detail Settings
hughchen [Wed, 16 Oct 2019 07:27:17 +0000 (15:27 +0800)]
Adds cross-profile intents for Bluetooth detail Settings

Bug: 142349493
Test: manually
Change-Id: If8c0f9d52c81226c6aa567520c3848189b489a31

4 years agoFix Connected devices page UI not update after paired
hughchen [Tue, 15 Oct 2019 09:27:13 +0000 (17:27 +0800)]
Fix Connected devices page UI not update after paired

This CL before, onChanged(null) will cause PreferenceGroup
didn't update UI in ConnectedDeviceDashboardFragment.

This CL remove onChanged(null) and set unvisible of SliceView
in the constructor.

Bug: 142220754
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib20db373430589c5c5efbe8a4c866b7fae4f3399

4 years agoEnforce policy management.
joshmccloskey [Tue, 15 Oct 2019 00:45:57 +0000 (17:45 -0700)]
Enforce policy management.

Test: Verified disabling fingerprint will not allow
the user to unlock work apps with fingerprint. (But can use fingeprint
within apps.)
Test: Verified disabling face and/or iris on a fingerprint device will
continue to
allow the user to unlock work apps with fingerprint.
Test: Verified disabling face on a face authentication device
will not allow the user to unlock work apps with face authentication.
(But can use face
authentication within apps.)
Test: Verified disabling fingerprint and/or iris on a face
authentication device will continue to allow the user to unlock work
apps with face authentication.
Bug: 141382589

Change-Id: I74135dd9f6afb1b789302ad0af3daf8a73a4181b

4 years agoFix NPE when user goes from none to swipe for lockscreen
Rubin Xu [Tue, 15 Oct 2019 22:51:10 +0000 (23:51 +0100)]
Fix NPE when user goes from none to swipe for lockscreen

If the user currently doesn't have a password and transitions
into another empty lockscreen (none -> swipe or swipe -> none),
there is no need to call setLockCredential.

Bug: 142701762
Test: Not yet :(
Change-Id: I553c8b30c7414775185d632660d962a73607baca

4 years agoMerge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317 am...
Raff Tsai [Tue, 15 Oct 2019 19:03:41 +0000 (12:03 -0700)]
Merge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317 am: f35dddaef5
am: 3e8a86910c

Change-Id: I7244a108d1c358859b80adfecb551d16d4c18f1c

4 years agoMerge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317
Raff Tsai [Tue, 15 Oct 2019 18:36:40 +0000 (11:36 -0700)]
Merge "Make sure close button has proper color" am: 0f9ad6d7f9 am: 2bb6e54317
am: f35dddaef5

Change-Id: Ie3330395e2c214b56b92cc44ae464ad7d2f48425

4 years agoMerge "Make sure close button has proper color" am: 0f9ad6d7f9
Raff Tsai [Tue, 15 Oct 2019 18:02:23 +0000 (11:02 -0700)]
Merge "Make sure close button has proper color" am: 0f9ad6d7f9
am: 2bb6e54317

Change-Id: Iec6c4ec81a1be8f1635683a613fbde10c5dc1210

4 years ago[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master...
Xin Li [Tue, 15 Oct 2019 17:49:05 +0000 (10:49 -0700)]
[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac am: c789e737f8
am: 9a65c35a9f -s ours
am skip reason: subject contains skip directive

Change-Id: I501cb1b278861d0c3e6ebddf15972d158afaed5f

4 years agoDO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac
Xin Li [Tue, 15 Oct 2019 17:30:34 +0000 (10:30 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac
am: c789e737f8

Change-Id: I0dc7cbba09c4e1405c61e68442a43fe4d703bf0a

4 years agoDO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Xin Li [Tue, 15 Oct 2019 17:11:14 +0000 (10:11 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: acfebe21ac

Change-Id: Ic67eed1985854f82ea33c59d88589cad46deda29

4 years agoMerge "Add tablayout for work/personal profile"
Raff Tsai [Tue, 15 Oct 2019 16:28:58 +0000 (16:28 +0000)]
Merge "Add tablayout for work/personal profile"

4 years agoMerge "Fix IllegalStateException in recyclerview"
Raff Tsai [Tue, 15 Oct 2019 16:28:09 +0000 (16:28 +0000)]
Merge "Fix IllegalStateException in recyclerview"

4 years agoMerge "Make sure close button has proper color"
Raff Tsai [Tue, 15 Oct 2019 10:32:29 +0000 (03:32 -0700)]
Merge "Make sure close button has proper color"
am: 0f9ad6d7f9

Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550

4 years agoMerge "Make sure close button has proper color"
Raff Tsai [Tue, 15 Oct 2019 10:11:56 +0000 (10:11 +0000)]
Merge "Make sure close button has proper color"

4 years agoAdd tablayout for work/personal profile
Raff Tsai [Sat, 5 Oct 2019 01:32:19 +0000 (09:32 +0800)]
Add tablayout for work/personal profile

- Add Tablayout in ProfileSelectFragment
- Add AccountWorkProfileDashboardFragment inherited from
ProfileSelectFragment
- Add ProfileFragmentBridge to convert AccountDashboardFragment
to AccountProfileSelectFragment
- Use flag settings_work_profile to guard the new fragment

Bug: 141601408
Test: Settings->developer options->feature flags->
turn settings_work_profile on/off, then go to settings->account
to see if UI is changed.

Change-Id: Ifb32c22cdeab69c51517664081cacf4a401c46a1

4 years agoFix IllegalStateException in recyclerview
Raff Tsai [Tue, 15 Oct 2019 04:34:03 +0000 (12:34 +0800)]
Fix IllegalStateException in recyclerview

- Fixed by updating UI in mainthread

Fixes: 142241908
Fixes: 142220754
Test: manual test if it crashes again
Change-Id: Ia83b66d3e60201bc524dbfab69bdeaa5201d38c2

4 years agoMerge "Add the checkstyle_hook into PREUPLOAD.cfg"
Raff Tsai [Tue, 15 Oct 2019 05:38:13 +0000 (05:38 +0000)]
Merge "Add the checkstyle_hook into PREUPLOAD.cfg"

4 years agoMerge "5G meteredness for telephony framework"
Sarah Chin [Mon, 14 Oct 2019 23:31:45 +0000 (23:31 +0000)]
Merge "5G meteredness for telephony framework"

4 years agoDO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Xin Li [Mon, 14 Oct 2019 20:25:43 +0000 (13:25 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master

Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471

4 years agoMerge "Remove config_show_regulatory_info tests"
Ryan Mitchell [Mon, 14 Oct 2019 16:14:30 +0000 (16:14 +0000)]
Merge "Remove config_show_regulatory_info tests"

4 years agoMerge "Introduce LockscreenCredential"
Rubin Xu [Mon, 14 Oct 2019 13:45:15 +0000 (13:45 +0000)]
Merge "Introduce LockscreenCredential"

4 years agoAdd the checkstyle_hook into PREUPLOAD.cfg
Sunny Shao [Mon, 14 Oct 2019 12:48:18 +0000 (20:48 +0800)]
Add the checkstyle_hook into PREUPLOAD.cfg

Check the unused import and the sequence of import before submitting.

Fixes: 142160947
Test: Manual test
Change-Id: I846f4ab5f349f0017163cf9d35b4d44e85597bbc

4 years agoUpdate string
hughchen [Mon, 14 Oct 2019 07:11:49 +0000 (15:11 +0800)]
Update string

Change the headers from:
"Available media devices" â†’ "Media devices"
"Available call devices" â†’ "Call devices"
"Currently connected" â†’ "Other devices"

Bug: 110920548
Test: manually
Change-Id: Idf283576353c9f65caa15ba8beca39f24721caa5

4 years ago[automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843...
SongFerng Wang [Mon, 14 Oct 2019 07:51:42 +0000 (00:51 -0700)]
[automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32 am: 951e9b7742 am: 9507e5f2f9 -s ours
am: dfc67693f5 -s ours
am skip reason: change_id Ifaed6ca8aba8f34ecb27abb863aeaf679132934f with SHA1 dfd9aa99e5 is in history

Change-Id: Id16116de1bc78c1986e6c1a5054900f3ea7cb0b7

4 years ago[automerger skipped] Preferred network list add 5G item am: 76422cab68 am: 10d41f52b7...
SongFerngWang [Mon, 14 Oct 2019 07:51:34 +0000 (00:51 -0700)]
[automerger skipped] Preferred network list add 5G item am: 76422cab68 am: 10d41f52b7 am: 24b3051e9b -s ours
am: 1c976be2a7 -s ours
am skip reason: change_id I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90 with SHA1 dd7f9b57f6 is in history

Change-Id: I84787a37c9a2567071388c9c8378a4b98e5373f2

4 years ago[automerger skipped] RadioInfo network mode list and network mode string add 5G am...
SongFerngWang [Mon, 14 Oct 2019 07:51:26 +0000 (00:51 -0700)]
[automerger skipped] RadioInfo network mode list and network mode string add 5G am: dc5149efef am: 8cd10f774d am: fae02cf405 -s ours
am: 35abbc425c -s ours
am skip reason: change_id I945d3c2fd175f45151bbeee475e388ccc2d67642 with SHA1 ec384c2f6f is in history

Change-Id: Ibfb93ab880b728d21c6bd103fdcd38536e29c081

4 years ago[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e am...
Bonian Chen [Mon, 14 Oct 2019 07:51:18 +0000 (00:51 -0700)]
[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e am: b36ff74ac3 -s ours am: ef55302465 -s ours
am: 54d7a7e5f8 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1 128de7bdb6 is in history

Change-Id: I02edfa986dbde7d2ee5297a0a5145bde9a8112e0

4 years ago[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting...
Antony Sargent [Mon, 14 Oct 2019 07:51:09 +0000 (00:51 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8cee6 -s ours am: 0f1b14e467 -s ours am: 5a4c8856bc -s ours
am: 81851fdcc7 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608 is in history

Change-Id: I6fad0560c7a6751c05a7d9a8dfcda8cf76639b07

4 years ago[automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843...
SongFerng Wang [Mon, 14 Oct 2019 07:45:38 +0000 (00:45 -0700)]
[automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32 am: 951e9b7742
am: 9507e5f2f9 -s ours
am skip reason: change_id Ifaed6ca8aba8f34ecb27abb863aeaf679132934f with SHA1 dfd9aa99e5 is in history

Change-Id: I8f79a9268e0ccef959e3802406b22cffb86a8f0e

4 years ago[automerger skipped] Preferred network list add 5G item am: 76422cab68 am: 10d41f52b7
SongFerngWang [Mon, 14 Oct 2019 07:45:30 +0000 (00:45 -0700)]
[automerger skipped] Preferred network list add 5G item am: 76422cab68 am: 10d41f52b7
am: 24b3051e9b -s ours
am skip reason: change_id I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90 with SHA1 dd7f9b57f6 is in history

Change-Id: I2c6e54c59018227081f896beef1fca68dc7fa322

4 years ago[automerger skipped] RadioInfo network mode list and network mode string add 5G am...
SongFerngWang [Mon, 14 Oct 2019 07:45:23 +0000 (00:45 -0700)]
[automerger skipped] RadioInfo network mode list and network mode string add 5G am: dc5149efef am: 8cd10f774d
am: fae02cf405 -s ours
am skip reason: change_id I945d3c2fd175f45151bbeee475e388ccc2d67642 with SHA1 ec384c2f6f is in history

Change-Id: Id95745ca4710f72232d472ae89c64741002e811a

4 years ago[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e am...
Bonian Chen [Mon, 14 Oct 2019 07:45:14 +0000 (00:45 -0700)]
[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e am: b36ff74ac3 -s ours
am: ef55302465 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1 128de7bdb6 is in history

Change-Id: I1c4d75ea62efd825f4cd4ac3fecf2c9e4b5288fc

4 years ago[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting...
Antony Sargent [Mon, 14 Oct 2019 07:45:06 +0000 (00:45 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8cee6 -s ours am: 0f1b14e467 -s ours
am: 5a4c8856bc -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608 is in history

Change-Id: I5a90bf84d360c22f21e0fc830f480e9c7fb11d01

4 years agoMerge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32
SongFerng Wang [Mon, 14 Oct 2019 07:39:16 +0000 (00:39 -0700)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32
am: 951e9b7742

Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17

4 years agoPreferred network list add 5G item am: 76422cab68
SongFerngWang [Mon, 14 Oct 2019 07:39:09 +0000 (00:39 -0700)]
Preferred network list add 5G item am: 76422cab68
am: 10d41f52b7

Change-Id: I3356ff24d7d8669aae438bdccab9bccce5d3e295

4 years agoRadioInfo network mode list and network mode string add 5G am: dc5149efef
SongFerngWang [Mon, 14 Oct 2019 07:39:02 +0000 (00:39 -0700)]
RadioInfo network mode list and network mode string add 5G am: dc5149efef
am: 8cd10f774d

Change-Id: I3d2f8561ebb74cb5bb73ad2cc65b4d0df3454851

4 years ago[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e
Bonian Chen [Mon, 14 Oct 2019 07:38:54 +0000 (00:38 -0700)]
[automerger skipped] [Settings] hide preferred network mode UI am: 92eb42c69e
am: b36ff74ac3 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1 128de7bdb6 is in history

Change-Id: Ieff603d09fc5be1a2439eb5674c1aad25751779f

4 years ago[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting...
Antony Sargent [Mon, 14 Oct 2019 07:38:46 +0000 (00:38 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8cee6 -s ours
am: 0f1b14e467 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608 is in history

Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a

4 years agoMerge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
SongFerng Wang [Mon, 14 Oct 2019 07:34:20 +0000 (00:34 -0700)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am: bc6a65ca32

Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92

4 years agoPreferred network list add 5G item
SongFerngWang [Mon, 14 Oct 2019 07:34:10 +0000 (00:34 -0700)]
Preferred network list add 5G item
am: 76422cab68

Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621

4 years agoRadioInfo network mode list and network mode string add 5G
SongFerngWang [Mon, 14 Oct 2019 07:33:54 +0000 (00:33 -0700)]
RadioInfo network mode list and network mode string add 5G
am: dc5149efef

Change-Id: Id55735d6933965735249e6c25981c137877b00ed

4 years ago[Settings] hide preferred network mode UI
Bonian Chen [Mon, 14 Oct 2019 07:33:34 +0000 (00:33 -0700)]
[Settings] hide preferred network mode UI
am: 92eb42c69e

Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc

4 years ago[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting...
Antony Sargent [Mon, 14 Oct 2019 07:33:09 +0000 (00:33 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
am: aa88b8cee6 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e8608 is in history

Change-Id: Ieb25eb9b4d1c9d85bcaa6e0532f8814339070f4c

4 years agoMove Emergency call button
Anamika Singh [Wed, 9 Oct 2019 12:36:41 +0000 (20:36 +0800)]
Move Emergency call button

This is google issue because in Q DecorView (base of CryptKeeper view)
has added Navigation bar forcefully due to which Emergency call button
was hidden on CryptKeeper view.
Made changes to shift ECC button above navigation bar.
Hence it will show just below CryptKeeper password entry view pattern/pin/password).

Bug: 142626673
Test: Manual

Change-Id: If60fad3936bc67adcf26019bdf16975b5706be83

4 years agoMerge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
SongFerng Wang [Mon, 14 Oct 2019 07:14:54 +0000 (07:14 +0000)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843

* changes:
  String "CDME" is wrong
  Preferred network list add 5G item
  RadioInfo network mode list and network mode string add 5G
  [Settings] hide preferred network mode UI
  Make EnabledNetworkModePreferenceController listen to setting changes

4 years agoString "CDME" is wrong
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong

Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f

4 years agoPreferred network list add 5G item
SongFerngWang [Fri, 30 Aug 2019 08:06:41 +0000 (16:06 +0800)]
Preferred network list add 5G item

Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.

Bug: 138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass

Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90

4 years agoRadioInfo network mode list and network mode string add 5G
SongFerngWang [Fri, 23 Aug 2019 10:03:27 +0000 (18:03 +0800)]
RadioInfo network mode list and network mode string add 5G

Bug: 131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642

4 years ago[Settings] hide preferred network mode UI
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[Settings] hide preferred network mode UI

Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.

Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
      atest EnabledNetworkModePreferenceControllerTest
      Manual with AT&T SIM card in out of servce and in service

Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968

4 years agoMake EnabledNetworkModePreferenceController listen to setting changes
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes

The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a

4 years agoUpdate the logic of querying crashed a11y services
Jackal Guo [Mon, 7 Oct 2019 05:35:50 +0000 (13:35 +0800)]
Update the logic of querying crashed a11y services

Bug: 129689483
Test: a11y CTS & unit tests
Test: manual
      1. Install and enable an intentional crashed a11y service.
      2. After it's crashed and malfunctioning, re-enable it.
      3. Check if it's bound again.

Change-Id: Ifda4fddfbe9b38841f5cc143c32ab1d2f059350c

4 years agoChange string of switchbar and installed service category title
Kevin Chang [Mon, 15 Jul 2019 08:23:51 +0000 (16:23 +0800)]
Change string of switchbar and installed service category title

Bug: 122897712
Test: Visual
Change-Id: I0f56b4b7375e651a74189dd17e6b3bd8b99ccfca

4 years agoIntroduce LockscreenCredential
Rubin Xu [Wed, 11 Sep 2019 16:36:37 +0000 (17:36 +0100)]
Introduce LockscreenCredential

Bug: 65239740
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: Icb73d639291d6d2eda8015e18e93d0906f916bb2

4 years agoMerge "Fix crash on clicking dismissed notifications"
TreeHugger Robot [Fri, 11 Oct 2019 19:12:41 +0000 (19:12 +0000)]
Merge "Fix crash on clicking dismissed notifications"

4 years agoMerge "Rename class"
TreeHugger Robot [Fri, 11 Oct 2019 18:38:38 +0000 (18:38 +0000)]
Merge "Rename class"

4 years agoFix crash on clicking dismissed notifications
Julia Reynolds [Fri, 11 Oct 2019 17:06:55 +0000 (13:06 -0400)]
Fix crash on clicking dismissed notifications

Read the channelid from the notification vs RankingMap
for historical notifications

Test: manual
Fixes: 142531668
Change-Id: Ia7b48e6bcee3995286eea2e2f5f3b6bc4cff98e2

4 years agoRename class
Julia Reynolds [Fri, 11 Oct 2019 14:08:56 +0000 (10:08 -0400)]
Rename class

Test: atest
Bug: 137397399
Change-Id: Idae73251bb67fbef2cf29f730f1420e98e38a8f3

4 years agoString "CDME" is wrong am: dfd9aa99e5
SongFerngWang [Fri, 11 Oct 2019 15:21:33 +0000 (08:21 -0700)]
String "CDME" is wrong am: dfd9aa99e5
am: 3146473921

Change-Id: I57682a62fc0e5a99dca0559c192edc734b0ff7ea

4 years agoString "CDME" is wrong
SongFerngWang [Fri, 11 Oct 2019 15:16:03 +0000 (08:16 -0700)]
String "CDME" is wrong
am: dfd9aa99e5

Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a

4 years agoRemove config_show_regulatory_info tests
Ryan Mitchell [Tue, 8 Oct 2019 22:58:22 +0000 (15:58 -0700)]
Remove config_show_regulatory_info tests

Runtime Resource Overlays (RROs) can no longer change the value of
resources in manifest when read during PackagerParser.

Remove usage of config_show_regulatory_info and rely on OEMs
configuring the component using <component-override>.

Bug: 135048762
Test: adb shell pm resolve-activity
com.android.settings/com.android.settings.RegulatoryInfoDisplayActivity
Change-Id: If48f40eb261a9c90e183d4ef9bcafb0fbda38f22

4 years agoString "CDME" is wrong
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong

Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f