Commit Graph

1256 Commits

Author SHA1 Message Date
TreeHugger Robot
5f964f1886 Merge "Remove settings_work_profile feature flag" 2020-01-16 15:10:17 +00:00
TreeHugger Robot
244afa02d2 Merge "Revert "Settings search - Navigate user to exact page"" 2020-01-16 13:06:24 +00:00
Edgar Wang
e19ee9a01f Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +08:00
Raff Tsai
3fbdf34a03 Remove settings_work_profile feature flag
Bug: 141601408
Test: robolectric
Change-Id: Ib7ef6794405fef6336690115680cf95b0e4c1542
2020-01-16 13:56:52 +08:00
Xin Li
ccbee6a795 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Automerger Merge Worker
d2fe041281 Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a am: 4a16d794e8 am: 40bd05a1b9
Change-Id: Ifb92c6944769ee58d45e16f6a9bde870c23bf27e
2020-01-15 23:32:17 +00:00
Automerger Merge Worker
40bd05a1b9 Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a am: 4a16d794e8
Change-Id: I2f2a31f5dff7b3b22794152d774e664569b2a2d8
2020-01-15 23:22:36 +00:00
Bonian Chen
368c885b98 [Settings] Remove unused ImsStatusPreferenceController
Legacy code clean up.

Bug: 147534443
Test: build pass
Change-Id: I4dd9c1c623296385eab6e14c10956cea27a04f75
2020-01-15 20:50:24 +08:00
tom hsu
72e5cecd2a Remove reference to PhoneConstant.
Create static constant in SimStatusDialogController.

Test: make
Test: m RunSettingsRoboTests
Change-Id: I2e1b9ac5b9ab051876f1bb26866d055f822bac90
2020-01-14 06:40:28 +00:00
Raff Tsai
4536fae5b7 Fix work tab app doesn't launch correct user intent
- Pass user.getIndentifier() to intent

Fixes: 147357696
Test: 1. go to Settings -> Storage -> Music&Audio
      2. switch to work tab
      3. tab "Audio files"
      4. should display work profile files

Change-Id: I0d2883c45eb7b883adbaf034c0a49c5e52ba82f6
2020-01-11 09:16:24 +08:00
Raff Tsai
44a39995f2 Merge work profile storage data together
- Storage UI used to have a work profile item. Now the item is
removed, all its size should merge to other item.

Fixes: 147127503
Test: Add work profile user, in Settings -> Storage page. Sum of
each item size should be similar to used size in the top of the page.

Change-Id: I9d4e2c8c53839da22fd0cdd5d2591a3245514191
2020-01-09 19:55:43 +08:00
TreeHugger Robot
d515ed7ba2 Merge "Update BrandedAccountPreferenceController" 2019-12-30 14:10:25 +00:00
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
Automerger Merge Worker
066d3f693d Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a am: c30575610c
Change-Id: I50d8ae9c889ae4764ffc8dcc7b8e714563b41bcd
2019-12-30 05:11:37 +00:00
Automerger Merge Worker
c30575610c Merge "Changed reference of telecom.Log to util.Log" am: f9d06dc434 am: 2bffc2754a
Change-Id: Ic36bfe8db4edba2a80353a9d4fa66027e5d92364
2019-12-30 04:59:08 +00:00
Lee Chou
1c5f319f3c Changed reference of telecom.Log to util.Log
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
TreeHugger Robot
69a59c9895 Merge "Settings search - Navigate user to exact page" 2019-12-25 08:13:17 +00:00
Edgar Wang
08f2a58459 Settings search - Navigate user to exact page
- remove duplicate index preference
- default set searchable = false when the preference has fragment
- make some fragments indexable

Bug: 143057584
Test: robotest & manual

Change-Id: I4d64f6106d2f92f0a45e8c7e26388677f593f412
2019-12-24 21:04:11 +08:00
Automerger Merge Worker
1a2b56bd80 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76 am: 857267b1e8
Change-Id: I8640c6516eb699f86c4570e23f3af0c92babdb94
2019-12-24 09:31:08 +00:00
Automerger Merge Worker
857267b1e8 Merge "Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs" am: 6bba42fb40 am: 27c52d5e76
Change-Id: I12080d93b39b990083f3ac795b7e4ae42ffcbe8d
2019-12-24 09:14:23 +00:00
Automerger Merge Worker
98d4dad16a Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f am: 0988f8cfec
Change-Id: I7867a8a6cc547e139facdfaee172066a4bd977b2
2019-12-23 06:32:29 +00:00
Automerger Merge Worker
4af546197b Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449
Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b
2019-12-23 06:22:32 +00:00
Automerger Merge Worker
0988f8cfec Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f
Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58
2019-12-23 06:21:54 +00:00
SongFerngWang
d6bc6dee08 Mainline:SimStatusDialogController decouple TelephonyManager hidden APIs
- telephonymanager set subid by createForSubscriptionId
  -getDataNetworkType(I)
  -getVoiceNetworkType(I)
  -getSimSerialNumber(I)
  -getServiceStateForSubscriber(I)
- copy getNetworkTypeName() to SimStatusDialogController

Bug: 143998492
Test: Build pass.
      make RunSettingsRoboTests ROBOTEST_FILTER\
      =SimStatusDialogControllerTest

Change-Id: Ieb8547496a4b0da7332abd227056f9b786c7ef6a
2019-12-23 14:12:56 +08:00
Bonian Chen
661f006bb2 Merge "[Settings] Add owners to support network part" 2019-12-23 05:57:59 +00:00
Bonian Chen
a0b942a6f4 [Settings] Add owners to support network part
Add more owners to support network part.

Bug: none
Test: none
Change-Id: I3fa0a72e75aace65887c461204fd9a33bd8fee13
Merged-In: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-12-23 12:40:07 +08:00
Yoshiaki Naka
81dbc00b6e Retrieve EID from each card
Each eUICC has its own EID. The same EID retrieved from the default
eUICC shall not be displayed for all the SIM status dialogs when the
device supports multiple UICCs.

Bug: 141256483
Test: Manual and SimStatusDialogControllerTest

Change-Id: I367ae3a5f97ff92e03312bed6fe37727ae3798ab
2019-12-18 17:57:47 +09:00
Automerger Merge Worker
107cd136a3 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
2019-12-16 08:31:03 +00:00
Automerger Merge Worker
11fa77b023 Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d
Change-Id: I9a02b9a67658623c51f657d56e345b736b91977c
2019-12-16 08:15:54 +00:00
Bonian Chen
1247771b88 [Settings] Adopting public API
Replace SubscriptionManager#getActiveSubscriptionInfoList(true) by
SubscriptionManager#getActiveSubscriptionInfoList() since they're
equivalent.

Bug: 146312766
Test: build pass
Change-Id: Iab8a141277e0199f75a3419527e15d63669224fc
2019-12-16 06:35:43 +00:00
Automerger Merge Worker
82c75c6eae Merge "Mainline use cellSignalStrength instead" am: 953ab80e0b am: 5693d157bd
Change-Id: I4445d70a94da15cadfff8c795397494c36f51c30
2019-12-12 10:19:01 +00:00
SongFerngWang
54b00d859b Mainline use cellSignalStrength instead
Bug: 146046311
Test: 1. open SIM status and check signal strength. (PASS)
2.atest make RunSettingsRoboTests /
ROBOTEST_FILTER=SimStatusDialogControllerTest(PASS)

Change-Id: I93e9dc09a01aa76b7d26660a32944df79cda93f3
Merged-In: I93e9dc09a01aa76b7d26660a32944df79cda93f3
2019-12-12 16:15:21 +08:00
SongFerng Wang
5a3ddb0fb1 Merge "Mainline use cellSignalStrength instead" 2019-12-12 07:45:51 +00:00
Raff Tsai
1e5d8146b5 Change ProfileType definition
Bug: 141601408
Test: rebuild
Change-Id: Ia4d4fabe8a4daad4ce54c243748fa3c29bf944ba
2019-12-12 13:44:35 +08:00
SongFerngWang
7e66fbd162 Mainline use cellSignalStrength instead
Bug: 146046311
Test: 1. open SIM status and check signal strength. (PASS)
2.atest make RunSettingsRoboTests /
ROBOTEST_FILTER=SimStatusDialogControllerTest(PASS)

Change-Id: I93e9dc09a01aa76b7d26660a32944df79cda93f3
2019-12-11 23:20:36 +08:00
TreeHugger Robot
cdcef1f50c Merge "Wifi Setting: Use SoftApConfiguration for Tether Setting" 2019-12-06 03:29:52 +00:00
lesl
ff012f03a8 Wifi Setting: Use SoftApConfiguration for Tether Setting
Bug: 145578449
Test: Manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
Change-Id: I02b4dcbb7b6e29b67ecc7356200f3fc3a1007562
2019-12-05 17:28:24 +08:00
Tsung-Mao Fang
be6c79557a Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de67
am: 3ebabb50f3

Change-Id: I44be408ef0958fbe7973894a90b378c666a74f59
2019-12-04 19:12:53 -08:00
Automerger Merge Worker
3ebabb50f3 Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de67
Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
2019-12-05 03:04:44 +00:00
Raff Tsai
910ea66615 Navigate to personal/work tab based on intent extra
Bug: 141601408
Test: Settings->Storage, click work tab, click Other apps. It should
navigate to Apps storage page and focus on WORK tab.
Change-Id: Ida91b279e771a2c7c960ce83b8e13310c87112e8
2019-12-04 11:42:23 +08:00
Tsung-Mao Fang
be895aea4c Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.

Test: Rebuild
Bug: 143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
2019-12-03 09:06:59 +00:00
Yi-Ling Chuang
2516848b30 Make some device info related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: Id38fd0203a4efc812e30990491786b4d8aff8902
2019-11-28 14:38:30 +08:00
Bonian Chen
dfba6f8720 [Setting] Fix merge conflict
Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-26 07:20:30 +00:00
Raff Tsai
21c466ff5b Fix testcase error
Fixes: 144832138
Fixes: 144831580
Test: robolectric
Change-Id: I01efc467cf75b5beb2d2dd23188a8fa7d67f32ed
2019-11-21 01:06:10 +08:00
Raff Tsai
84327f6aa3 Add storage_summary_donut above ProfileSelectStorageFragment
- Modify ProfileSelectFragment to support add preference xml in the
top, and tabLayout below the preferences. Base preference layout is
dummy_preference_screen.xml which contains no preference.
ProfileSelectStorageFragment contains StorageSummaryDonutPreference
above the tabLayout.
- Make StorageSummaryDonutPreferenceController self workable without
StorageDashboardFragment dependence.
- Rename inactive_apps.xml to dummy_preference_screen.xml
- Move ShadowPrivateStorageInfo from LowStorageSliceTest

Bug: 141601408
Test: manual
Change-Id: Ide12840dc81bb104f328e230ecda5d35bba01d7a
2019-11-18 18:18:29 +08:00
Kevin Lau Fang
a40bf2aec2 Merge "Revert submission" 2019-11-14 20:31:13 +00:00
Kevin Lau Fang
40dd1e2183 Revert submission
Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336).

Change-Id: I490dc6c933c08c3c83b962786df11bd2da66b28a
2019-11-14 20:07:38 +00:00
Sunny Shao
f3865e9264 Synced the code from master branch
Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-14 21:57:12 +08:00
Raff Tsai
b22bbffe90 Merge "Modify preference_list_fragment to support tabLayout" 2019-11-14 04:04:31 +00:00
Raff Tsai
988a912237 Modify preference_list_fragment to support tabLayout
- Remove buttonBar because it is only used in PublicVolumeSettings
- Add tabLayout in preference_list_fragment.xml

Bug: 141601408
Test: manual
Change-Id: Ieb84ccf2e685a03abec7b07cb8f9f4b64ee475e0
2019-11-13 17:37:59 +08:00