Commit Graph

58853 Commits

Author SHA1 Message Date
Automerger Merge Worker
9494af9634 Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00
Jason Chiu
b1cac8303c Fix failed tests on ResetPreferenceControllerTest
Should config shadow ShadowUserManager before using it

Fixes: 146881352
Test: robotest
Change-Id: I1ef33a8ee3c8c98eef2e3e257b7da81a9264783f
2019-12-26 19:45:44 +08:00
Daniel Huang
7664d08e28 Merge "Modify 5G RAT into Bearer field."
am: 79977fadca

Change-Id: Ie14628c1795dbd02393ef901a0fd7a699a9eba93
2019-12-26 03:32:40 -08:00
Daniel Huang
79977fadca Merge "Modify 5G RAT into Bearer field." 2019-12-26 11:29:13 +00:00
Bonian Chen
b373aeedfe [Settings] Replace getSimCount() API
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00
Jason Chiu
57384c44bb Fix the ripple effect of homepage slice cards
- It's caused by the two side paddings of SliceViewStyle.
- Adjust the slice inside paddings with a new attribute.

Fixes: 131278625
Test: visual
Change-Id: Iee2bc576c58bbdaf856b1b778ccf011302a34859
2019-12-26 10:27:07 +00:00
Automerger Merge Worker
97dc00392f [automerger skipped] Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea am: 3d73b7a832 -s ours
am skip reason: Change-Id I437a6e325112bf9d031a4eb11c28cb755c085bee with SHA-1 af4b43535f is in history

Change-Id: I34e6c966514d9c326ace2d7d17d5ffbb32aabeb0
2019-12-26 10:08:11 +00:00
Raff Tsai
1c0358aca4 Merge "Support caption second UI structure (2/n)" 2019-12-26 10:01:08 +00:00
Automerger Merge Worker
3d73b7a832 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" am: 047dd2dff9 am: 3835293aea
Change-Id: I9750d2b07e3b6280d2e3e9e2779f2740d24f0cdf
2019-12-26 09:55:38 +00:00
Edgar Wang
444b646b7a Remove un-used category from Date & Time Settings
Fixes: 141455224
Test: manual & roboteset
Change-Id: I2aba868c5e6645a11574a346f0a1e2f5ccb61ae1
2019-12-26 17:43:13 +08:00
Zoey Chen
3835293aea Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId"
am: 047dd2dff9

Change-Id: Ia665022e1d3357f68109905f976b84e89f66c045
2019-12-26 01:39:17 -08:00
Zoey Chen
047dd2dff9 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" 2019-12-26 09:36:58 +00:00
zoey chen
fc3ddb2f16 [Settings] Replace #getServiceStateForSubscriber with #getServiceState
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
Merged-In: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-26 17:12:42 +08:00
ChenJean
f55c5a44f1 Support caption second UI structure (2/n)
Group text size and style into appearance page.
Move language under more options page.

Bug: 143502915
Test: Maunal
Change-Id: Ice104ed844dc3a10a22c91a10211a8978da68cc3
2019-12-26 15:19:21 +08:00
Arc Wang
8692bb5924 [Wi-Fi] Apply WifiDialog2 in WifiSetings2
This change also implements context menu in WifiSettings2.

Bug: 70983952
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I13b5a3724207f76e2b24fd0c1c49a236ee0c44f0
2019-12-26 14:47:19 +08:00
Arc Wang
b33190c017 [Wi-Fi] Replace AccessPoint with WifiEntry for WifiDialog2
Bug: 146407136
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.detail2

Change-Id: I65899b24c186e1bd1bb0d00db52c67264f30f3cb
2019-12-26 14:45:38 +08:00
Arc Wang
f990dfa11e [Wi-Fi] Branch WifiDialog files for WifiTracker2 development
Add these files:

  WifiConfigController2.java
  WifiConfigUiBase2.java
  WifiDialog2.java

  WifiConfigController2Test.java
  WifiDialog2Test.java

Bug: 146407136
Test: compile
Change-Id: I0689ae8ddee4f35e3bc104fd0b2e94eb8f689630
2019-12-26 14:45:28 +08:00
hughchen
58a99c6dab Use flag to confirm whether callback should unregister
This CL before, this class use isAvailable() to check whether
should register/unregister callback.
UI will be updated when this callback called.
But in one case, the isAvailable() state will not consistent
on onStart() and onStop().
The isAvailable() state will not consistent when user disconnect
device then forgot the device.
It's will cause callback not unregister when meet this case.
Then callback will duplicate call many times cause UI update not smoth.

This CL use flag to confirm the callback will unreigser on onStop().

Bug: 146617530
Bug: 145647143
Test: make -j42 RunSettingsRoboTests
Change-Id: I2b503ca9a7040b94ccc64ae196dad5a228fcbc6a
2019-12-26 14:43:56 +08:00
menghanli
b7306044c9 Create settings for color inversion (2/n)
Provide a setting for new color inversion design.

Bug: 146019226
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ColorInversionPreferenceControllerTest
Test: make RunSettingsRoboTests2
Change-Id: I1d081c6321ee96d48e8f52304893e4a5fb59333a
2019-12-26 06:39:44 +00:00
Zoey Chen
b2c2f9d5e3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 05:50:12 +00:00
Automerger Merge Worker
43511f9691 [automerger skipped] Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d am: 22c2c14605 am: 631a1d206c -s ours
am skip reason: Change-Id I9911d2d565a60dbf4a6af47cc25c8345ac2c6355 with SHA-1 2d5171f68d is in history

Change-Id: I8dc44327b202078c376dfd2a5342b577ada29b18
2019-12-26 04:33:03 +00:00
Automerger Merge Worker
b041c8b28f Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b am: 4be4ae6a75 am: c5d575f085
Change-Id: I7dcc409def8e552563df280007363d820d4a28d3
2019-12-26 04:32:50 +00:00
Automerger Merge Worker
631a1d206c Merge "[Settings] Replace #getSimCount with #getActiveModemCount" am: 171eabcb2d am: 22c2c14605
Change-Id: Ic45f318e6784205e88a13f8a2fdf7fcdb04c9955
2019-12-26 04:17:42 +00:00
Automerger Merge Worker
c5d575f085 Merge "[Settings] Replace TelephonyManager#from()" am: 98e6ab358b am: 4be4ae6a75
Change-Id: Ie2daa594c252d71e63125108036a4428563bed5b
2019-12-26 04:17:28 +00:00
danielwbhuang
957526abca Modify 5G RAT into Bearer field.
Only keep NR in here, remove GSM, TD_SCDMA, IWLAN and LTE_CA.

Bug: 143995814
Test: 1. Build pass.
      2. make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest
      3. check UI:
      3-1. Open APN settings page: Settings > Network & Internet > Mobile Network > Advanced > Access Point Names.
      3-2. Click the 3 dots at the up corner, and then select "New APN" > "Bearer"

Change-Id: I9b8efbe26c2702696f720f0f221f3d65f785e644
2019-12-26 12:08:31 +08:00
Hai Shalom
457203e156 [DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent
Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent to include
additional information in case of a failure. The intent will
return an extra field with result code for R1 and R2 devices,
and additional details for R2 devices: SSID, channe list,
and band list.

Bug: 139381558
Test: Manual test
Change-Id: I6f1805f3b1ff72efc83961083c1311a24d6ebd3e
2019-12-25 20:06:38 -08:00
Zoey Chen
22c2c14605 Merge "[Settings] Replace #getSimCount with #getActiveModemCount"
am: 171eabcb2d

Change-Id: I2d015004494903e791d3cb3a93e8f428798e99db
2019-12-25 20:02:43 -08:00
Bonian Chen
4be4ae6a75 Merge "[Settings] Replace TelephonyManager#from()"
am: 98e6ab358b

Change-Id: I3db67a7e5037ab06ac5146e0367f759245d95246
2019-12-25 20:00:55 -08:00
Raff Tsai
791ad4d568 Sync lastest SettingsLib interface
Test: rebuild
Change-Id: I3131f701deb47acae9f19436cbe66e077ea004ee
2019-12-26 11:58:38 +08:00
Zoey Chen
171eabcb2d Merge "[Settings] Replace #getSimCount with #getActiveModemCount" 2019-12-26 03:44:47 +00:00
jasonwshsu
3d94a57d97 Accessibility shortcut secondary action - divide different fragment for different fragment type
Different accessibility service fragment type have different UI.
- AccessibilityServiceFragmentType.LEGACY will use LegacyAccessibilityServicePreferenceFragment
- AccessibilityServiceFragmentType.INVISIBLE will use InvisibleToggleAccessibilityServicePreferenceFragment
- AccessibilityServiceFragmentType.INTUITIVE will use ToggleAccessibilityServicePreferenceFragment

Bug: 142530063
Test: Manual
Change-Id: Ib32a4f97514450e5c0d29e99c22935efecf8b6df
2019-12-26 11:40:11 +08:00
Bonian Chen
98e6ab358b Merge "[Settings] Replace TelephonyManager#from()" 2019-12-26 03:36:09 +00:00
hughchen
d89518e3c5 Finish bluetooth detail fragment if device is BOND_NONE
This CL is used to check the bluetooth bond state when
fragment is onResume. The bluetooth detail fragment will
finish if the bluetooth bond state is BOND_NONE when
fragment is onResume.

Bug: 146621601
Test: make -j42 RunSettingsRoboTests
Change-Id: I157e1da925dcf527ce2b49ad431079d90b7c4fc3
2019-12-26 11:32:58 +08:00
zoey chen
5b336b1bd9 [Settings] Replace #getSimCount with #getActiveModemCount
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
Merged-In: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 16:30:25 +08:00
zoey chen
ac92bab305 [Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId
Bug: 146823458
Test: make
Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee
Merged-In: I437a6e325112bf9d031a4eb11c28cb755c085bee
2019-12-25 16:27:00 +08:00
Jason Chiu
4e7229c440 Merge "[Settings] Add a metric for time spending in each Settings page" 2019-12-25 08:23:48 +00:00
zoey chen
f74850d559 [Settings] Replace #getSubscriberId(I) with #getSubscriberId()
Bug: 146823314
Test: make
Change-Id: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
Merged-In: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
2019-12-25 16:23:16 +08:00
Zoey Chen
f112959b96 Merge "[Settings] Replace #getSimCount with #getActiveModemCount" 2019-12-25 08:15:44 +00:00
Zoey Chen
f1a28ca6d6 Merge "[Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId" 2019-12-25 08:15:26 +00:00
Zoey Chen
a485de0db9 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-25 08:15:21 +00:00
TreeHugger Robot
69a59c9895 Merge "Settings search - Navigate user to exact page" 2019-12-25 08:13:17 +00:00
zoey chen
e9c59f5fad [Settings] Replace #getServiceStateForSubscriber with #getServiceState
Bug: 146821501
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11
2019-12-25 15:48:58 +08:00
zoey chen
2d5171f68d [Settings] Replace #getSimCount with #getActiveModemCount
Bug: 146815553
Test: make
Change-Id: I9911d2d565a60dbf4a6af47cc25c8345ac2c6355
2019-12-25 15:09:00 +08:00
zoey chen
af4b43535f [Settings] Replace #getSubIdForPhoneAccount with #getSubscriptionId
Bug: 146823458
Test: make
Change-Id: I437a6e325112bf9d031a4eb11c28cb755c085bee
2019-12-25 15:05:27 +08:00
zoey chen
353926a446 [Settings] Replace #getSubscriberId(I) with #getSubscriberId()
Bug: 146823314
Test: make
Change-Id: Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1
2019-12-25 15:04:20 +08:00
SongFerng Wang
43372eeced Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" 2019-12-25 05:56:27 +00:00
Automerger Merge Worker
49a0ed20f1 Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35 am: b8a6b088b3
Change-Id: I22bf2290015bd45a686437b4460a1da92c96e634
2019-12-25 03:29:39 +00:00
Automerger Merge Worker
b8a6b088b3 Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35
Change-Id: Ib32da629e9c227cd92e013527e04eb345fa63732
2019-12-25 03:16:37 +00:00
Jason Chiu
9c628ee945 [Settings] Add a metric for time spending in each Settings page
Add elapsed time in the target page hidden metric

Bug: 146610928
Test: robotest
Change-Id: If045a203e3ca64e36ec5d764b3488d10f26c4408
2019-12-25 11:06:16 +08:00
changbetty
0c7ec95f35 Merge "[Mainline] Remove unused UiccController object"
am: e29ca94af4

Change-Id: Icacf8c1bc3beee5f9d3db59f448204cc4ed73eb8
2019-12-24 19:03:25 -08:00