Commit Graph

1086 Commits

Author SHA1 Message Date
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
Dianne Hackborn
cdbc0dfa6a Rework platform version to hide codenames.
The public platform version no longer can be a codename, it is
always the most recently released platform.  A new build property
and API provides either the offical version or the current codename
as appropriate.  This will avoid breaking apps that look at the
platform version while development is under a codename.

Bug:  143175463
Test: manual
Change-Id: I711ca20c4c8ce389697e940696051a336f5fd808
2019-11-12 15:55:59 -08:00
Sunny Shao
0f844d168b Use the getBidiFormattedPhoneNumber to replace getFormattedPhoneNumber
Fixes: 123698996
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a
2019-11-08 16:36:33 +08:00
Raff Tsai
e223b33632 Fix NullPointerException
initLoader will reuse the old loader associated with fragment.
But the fragment is destroyed. Use restartLoader which will
create another loader with new fragment.

Fixes: 143445993
Test: rebuild
Change-Id: I0a8a00ae94122f25d6d860b2512108ecd11d7806
2019-10-29 14:20:09 +08:00
Xin Li
e2c2504c94 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +00:00
Raff Tsai
539ab8ace4 Add work/personal profile tab for storage page
- Add ProfileSelectStorageFragment
- Check featureFlag in SecondaryUserController to decide show/hide
workprofile item StorageDashboardFragment

Bug: 141601408
Test: manual
Change-Id: I97762d3b1a4985e2b186b34fc37c7976c2f69224
2019-10-25 16:57:24 +08:00
Raff Tsai
062baadf4e Merge "Add personal/work tab for ManageApplications" 2019-10-22 23:47:32 +00:00
Chen Xu
24a72eb92a move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
(cherry picked from commit 86a8e9b627)
Merged-in: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
2019-10-20 04:05:06 +00:00
Raff Tsai
c898775914 Hide search box if it is called in initial setup wizard
- Search box is hidden if user set intent extra isSetupFlow true

Fixes: 135717823
Test: search box is hidden in the following command
adb shell am start -a android.settings.SETTINGS --ez isSetupFlow true

Change-Id: Ia3d955c9390d6b0eef9391b9b35b6a483eb63d26
2019-10-18 02:08:38 +00:00
Raff Tsai
afd494d335 Add personal/work tab for ManageApplications
- Add ProfileSelectManageApplications containing tabLayout
- Modify StorageItemPreferenceController to display only personal
or work profile data
- Add getTargetFragment in Utils to handle fragment selection

Bug: 141601408
Test: manual
Change-Id: Ie4db1ce2e77f60a82018e5a3e1f2fccb812502dc
2019-10-16 17:08:31 +08:00
Chen Xu
86a8e9b627 move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage(cellbroadcast can be received
when sim is absent)
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa
2019-10-07 11:33:03 -07:00
TreeHugger Robot
d48189c564 Merge "Use SettingsLib Indexable" 2019-09-26 06:51:17 +00:00
Bonian Chen
2d41dbf141 [Owner] Add allenwtsu into Settings Telephony part
Add allenwtsu into owner list of Telephony part within Settings apk

Bug: 0
Test: none
Change-Id: Ic2820bc113bc26fc0d162c42c7925477177127ae
2019-09-25 21:26:44 +08:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
Yanting Yang
afe788ca19 Set phone number preference unselectable
For multiple sim case, there are two or more phone number preferences in
About page. They should be grayed out because they don't have actions.

Fixes: 138263122
Test: Visual
Change-Id: I86ec37d049983c23b8990dda0e12bfadebf70d1e
2019-09-05 22:22:10 +08:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Edgar Wang
99bc55da73 Add OWNER for deviceinfo/network/sim package.
Bug: 139881606
Test: None
Change-Id: If265c51360675d44bfce8d4790d1bf8d4207fc46
2019-08-23 03:06:20 +08:00
Raff Tsai
47dcff42df Fix storage page slow loading issue
StorageAsyncLoader is the bottleneck. It needs to loop all installed
apps and count all apps size. Original design was waiting the
asyncLoader went back then hide the loading icon. Change the design
to hide the loading icon before asyncLoader is back.

Fixes: 138964123
Test: manual
Change-Id: I54c2efa7cf61d711145811619512d927adcee210
2019-08-07 10:31:36 +08:00
Sunny Shao
f67401a4c3 Merge "Use the date format to show the system update info" into qt-r1-dev
am: a076039803

Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
2019-07-23 03:36:02 -07:00