Commit Graph

56982 Commits

Author SHA1 Message Date
Raff Tsai
05ecd7b425 Merge "Fix IllegalStateException in recyclerview" 2019-10-15 16:28:09 +00:00
Raff Tsai
2bb6e54317 Merge "Make sure close button has proper color"
am: 0f9ad6d7f9

Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
2019-10-15 03:32:29 -07:00
Raff Tsai
0f9ad6d7f9 Merge "Make sure close button has proper color" 2019-10-15 10:11:56 +00:00
Raff Tsai
65866290ce 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
2019-10-15 18:01:08 +08:00
Raff Tsai
40d9986fd7 Fix IllegalStateException in recyclerview
- Fixed by updating UI in mainthread

Fixes: 142241908
Fixes: 142220754
Test: manual test if it crashes again
Change-Id: Ia83b66d3e60201bc524dbfab69bdeaa5201d38c2
2019-10-15 09:52:34 +00:00
Raff Tsai
a152d2bd61 Merge "Add the checkstyle_hook into PREUPLOAD.cfg" 2019-10-15 05:38:13 +00:00
Sarah Chin
94f1ad0bad Merge "5G meteredness for telephony framework" 2019-10-14 23:31:45 +00:00
Xin Li
acfebe21ac DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
2019-10-14 22:54:19 +00:00
Ryan Mitchell
dc67778100 Merge "Remove config_show_regulatory_info tests" 2019-10-14 16:14:30 +00:00
Rubin Xu
7a3ebe7c61 Merge "Introduce LockscreenCredential" 2019-10-14 13:45:15 +00:00
Sunny Shao
b7734a754b 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
2019-10-14 21:03:17 +08:00
hughchen
946c6f0dfe 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
2019-10-14 16:16:24 +08:00
SongFerng Wang
d52223fcf7 [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
2019-10-14 00:51:42 -07:00
SongFerngWang
5a08a7a7c1 [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
2019-10-14 00:51:34 -07:00
SongFerngWang
d79258ec93 [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
2019-10-14 00:51:26 -07:00
Bonian Chen
d730a67869 [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
2019-10-14 00:51:18 -07:00
Antony Sargent
7cb7bd640f [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
2019-10-14 00:51:09 -07:00
SongFerng Wang
dfc67693f5 [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
2019-10-14 00:45:38 -07:00
SongFerngWang
1c976be2a7 [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
2019-10-14 00:45:30 -07:00
SongFerngWang
35abbc425c [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
2019-10-14 00:45:23 -07:00
Bonian Chen
54d7a7e5f8 [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
2019-10-14 00:45:14 -07:00
Antony Sargent
81851fdcc7 [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
2019-10-14 00:45:06 -07:00
SongFerng Wang
9507e5f2f9 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am: bc6a65ca32
am: 951e9b7742

Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17
2019-10-14 00:39:16 -07:00
SongFerngWang
24b3051e9b Preferred network list add 5G item am: 76422cab68
am: 10d41f52b7

Change-Id: I3356ff24d7d8669aae438bdccab9bccce5d3e295
2019-10-14 00:39:09 -07:00
SongFerngWang
fae02cf405 RadioInfo network mode list and network mode string add 5G am: dc5149efef
am: 8cd10f774d

Change-Id: I3d2f8561ebb74cb5bb73ad2cc65b4d0df3454851
2019-10-14 00:39:02 -07:00
Bonian Chen
ef55302465 [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
2019-10-14 00:38:54 -07:00
Antony Sargent
5a4c8856bc [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
2019-10-14 00:38:46 -07:00
SongFerng Wang
951e9b7742 Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am: bc6a65ca32

Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
2019-10-14 00:34:20 -07:00
SongFerngWang
10d41f52b7 Preferred network list add 5G item
am: 76422cab68

Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
2019-10-14 00:34:10 -07:00
SongFerngWang
8cd10f774d RadioInfo network mode list and network mode string add 5G
am: dc5149efef

Change-Id: Id55735d6933965735249e6c25981c137877b00ed
2019-10-14 00:33:54 -07:00
Bonian Chen
b36ff74ac3 [Settings] hide preferred network mode UI
am: 92eb42c69e

Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
2019-10-14 00:33:34 -07:00
Antony Sargent
0f1b14e467 [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
2019-10-14 00:33:09 -07:00
Anamika Singh
a6f03fd0db 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
2019-10-14 07:20:15 +00:00
SongFerng Wang
bc6a65ca32 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
2019-10-14 07:14:54 +00:00
SongFerngWang
7fa128edcd String "CDME" is wrong
Bug: 142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
2019-10-14 05:01:18 +00:00
SongFerngWang
76422cab68 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
2019-10-14 05:01:09 +00:00
SongFerngWang
dc5149efef 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
2019-10-14 05:01:01 +00:00
Bonian Chen
92eb42c69e [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
2019-10-14 05:00:52 +00:00
Antony Sargent
aa88b8cee6 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
2019-10-14 04:59:03 +00:00
Jackal Guo
52bd31f5df 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
2019-10-14 12:25:35 +08:00
Kevin Chang
a6308c09a8 Change string of switchbar and installed service category title
Bug: 122897712
Test: Visual
Change-Id: I0f56b4b7375e651a74189dd17e6b3bd8b99ccfca
2019-10-14 11:05:59 +08:00
Yi-Ling Chuang
ddf6cefcac Fix non responding slice toggling
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.

Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to
prevent from getting PendingIntent.CancelExcpetion from SliceActionView
when toggling slices.

This change only applies on those auto converted Slices.

Bug: 142107748
Test: toggle slices in Settings Search and NGA
Change-Id: Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964
2019-10-14 09:31:50 +08:00
Rubin Xu
010116a173 Introduce LockscreenCredential
Bug: 65239740
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Change-Id: Icb73d639291d6d2eda8015e18e93d0906f916bb2
2019-10-13 21:20:02 +01:00
TreeHugger Robot
764115ca4e Merge "Fix crash on clicking dismissed notifications" 2019-10-11 19:12:41 +00:00
TreeHugger Robot
b07227d01e Merge "Rename class" 2019-10-11 18:38:38 +00:00
Julia Reynolds
d80ddbd82b Fix crash on clicking dismissed notifications
Read the channelid from the notification vs RankingMap
for historical notifications

Test: manual
Fixes: 142531668
Change-Id: Ia7b48e6bcee3995286eea2e2f5f3b6bc4cff98e2
2019-10-11 17:27:36 +00:00
Julia Reynolds
3b10e450cb Rename class
Test: atest
Bug: 137397399
Change-Id: Idae73251bb67fbef2cf29f730f1420e98e38a8f3
2019-10-11 11:45:51 -04:00
SongFerngWang
ce37679e3a String "CDME" is wrong am: dfd9aa99e5
am: 3146473921

Change-Id: I57682a62fc0e5a99dca0559c192edc734b0ff7ea
2019-10-11 08:21:33 -07:00
SongFerngWang
3146473921 String "CDME" is wrong
am: dfd9aa99e5

Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a
2019-10-11 08:16:03 -07:00
Ryan Mitchell
4de772fddb 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
2019-10-10 18:06:57 +00:00