Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,748 Commits 1 Branch 0 Tags
12cef917603cc66f2b53c9bcf6be188bb85a6d59
Commit Graph

57748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Shao
12cef91760 Update BrandedAccountPreferenceController 
Use the updateState to decide the preference display due to the displayPreference
could not be called while user press BACK key then the upper page gone and bottom
page reshow.

Fixes: 146989749
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
Change-Id: I00b08b59c533ed0832ed07e6231138dd88084517
 2019-12-30 18:13:37 +08: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
TreeHugger Robot
31a8699e77 Merge "Remove un-used category from Date & Time Settings" 2019-12-26 12:04:37 +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
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
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
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
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