Commit Graph

57923 Commits

Author SHA1 Message Date
TreeHugger Robot
b897eb8551 Merge "[Wi-Fi] Branch WifiDialog files for WifiTracker2 development" 2019-12-27 07:42:52 +00:00
Edgar Wang
9a2d348aa0 Enlarge height of Edit box in "Profile info" dialog
Fixes: 140002880
Test: manual
Change-Id: If9f8c3f4360e886cfecabc3eb8c1a6da452f45d2
2019-12-27 15:35:34 +08:00
SongFerngWang
75c5940b7c Phone Info UI shows network type list which depends on RAT supported
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.

Bug: 146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)

Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-27 07:02:39 +00:00
Jason Chiu
b2639ad11f Merge "Fix the ripple effect of homepage slice cards" 2019-12-27 04:03:19 +00:00
TreeHugger Robot
dcf4dcae2f Merge "Settings: fix ShowRefreshRatePreferenceControllerTest" 2019-12-27 03:55:23 +00:00
Automerger Merge Worker
261b991169 Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2 am: cd46f2df4f
Change-Id: If269602bf8b34b08fcc9bf9bedd3b47219134e3e
2019-12-27 03:13:18 +00:00
TreeHugger Robot
08bd74c59c Merge "Finish bluetooth detail fragment if device is BOND_NONE" 2019-12-27 03:03:49 +00:00
Automerger Merge Worker
cd46f2df4f Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
92f25fadd2 Merge "[Settings] Replace getSimCount() API"
am: b0bddfec15

Change-Id: Ic3ddc7317f92b3d61b841aaa476e2bd734044796
2019-12-26 18:48:55 -08:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Menghan Li
7cbba20eec Merge "Fix CodeInspectionTest for CaptionPropertiesFragment" 2019-12-27 02:32:13 +00:00
Ady Abraham
68aacdd487 Settings: Increase char limit of show refresh rate
Increase the char limit for the developer option "show refresh rate"
to accommodate translations.

Bug: 146766957
Bug: 146766391
Change-Id: I324356278a31551db6da74ef0eb09068d36122b2
Test: Set a 36 char string on "show_refresh_rate" and observe no truncation
Test: Set a 58 char string on "show_refresh_rate_summary" and observe no truncation
2019-12-26 20:03:03 +00:00
Ady Abraham
21eaa773f5 Settings: fix ShowRefreshRatePreferenceControllerTest
ShowRefreshRatePreferenceControllerTest is using an incorrect type
(Int vs. Bool) which causing a test to fail.

Bug: 146767072
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.development
Change-Id: I9269c01619eebac9c0eac29e23f248d1c6d48ba5
2019-12-26 19:39:32 +00:00
TreeHugger Robot
e780606358 Merge "[DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" 2019-12-26 19:19:54 +00:00
Automerger Merge Worker
29f5c3bb20 [automerger skipped] Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08 am: a58c7ba27a -s ours
am skip reason: Change-Id I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 with SHA-1 e9c59f5fad is in history

Change-Id: I71bf1676d977129c86feb2200d44e83c98772663
2019-12-26 14:26:56 +00:00
Automerger Merge Worker
a58c7ba27a Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08
Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed
2019-12-26 14:15:29 +00:00
Zoey Chen
8ead010c08 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
am: e8cf63ddd3

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605
2019-12-26 06:01:41 -08:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Jason Hsu
24af3f4c81 Merge "Accessibility shortcut secondary action - divide different fragment for different fragment type" 2019-12-26 13:42:17 +00:00
Automerger Merge Worker
252553c07c [automerger skipped] Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c am: b206208982 -s ours
am skip reason: Change-Id Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1 with SHA-1 353926a446 is in history

Change-Id: Ie12e64a32b2c403151f7dab6406ac80967a2e206
2019-12-26 13:26:53 +00:00
Automerger Merge Worker
b206208982 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
2019-12-26 13:11:36 +00:00
Zoey Chen
4359db040c Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
2019-12-26 05:02:24 -08:00
TreeHugger Robot
cdae626f2a Merge "Fix failed tests on ResetPreferenceControllerTest" 2019-12-26 13:01:58 +00:00
menghanli
4a1617e44f Fix CodeInspectionTest for CaptionPropertiesFragment
Bug: 146883790
Test: make RunSettingsRoboTests2
Change-Id: I387149fa720c9c98291c00c63f99dc4d838c06aa
2019-12-26 20:56:14 +08:00
TreeHugger Robot
31a8699e77 Merge "Remove un-used category from Date & Time Settings" 2019-12-26 12:04:37 +00:00
robertluo
91751f8d68 Modify NFC function description
Fixes: 140156062
Test: manually and check if new string is applied
Screenshot: https://screenshot.googleplex.com/SQH204CZBVN.png

Change-Id: Ie1eb2387f8763f77aaf87a93c14b4d8d778ac7ee
2019-12-26 12:04:01 +00:00
Zoey Chen
47634431c6 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-26 12:01:22 +00:00
Automerger Merge Worker
aad8fd1e57 Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28 am: 9494af9634
Change-Id: I283ca8f4b4183ecbd894fa0b36cd4c35335ba6ac
2019-12-26 11:57:42 +00:00
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