Commit Graph

995 Commits

Author SHA1 Message Date
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
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
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
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
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
Xin Li
e2c2504c94 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:30 +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
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
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
Sunny Shao
47a1b24908 Use the date format to show the system update info
Use the "July 13, 2019" or similar to display if the value is a valid
date data.

Bug: 137089104
Test: visual test & robotest
Change-Id: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
Merged-In: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
(cherry picked from commit 162e88c262)
2019-07-22 04:59:27 +00:00
tmfang
58dcca9844 Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.

getFreeBytes was used when storage controller
tried to get storage information.

In order to prevent this case, we put the action
which takes too much time in background thread.

Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875

Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit 0c37f019f6)
2019-07-11 19:50:02 +00:00
tmfang
6ed2484766 Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
2019-07-11 01:12:18 -07:00
tmfang
496d3f6f9c Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.

getFreeBytes was used when storage controller
tried to get storage information.

In order to prevent this case, we put the action
which takes too much time in background thread.

Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes: 136268875

Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit 0c37f019f6)
2019-07-11 04:19:42 +00:00
Andrew Sapperstein
0c1f7da25a Merge "Add UI for mainline modules licenses." into qt-dev
am: 72aded338a

Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
2019-06-28 10:28:07 -07:00
Andrew Sapperstein
56a8c33c1b Add UI for mainline modules licenses.
Added a module licenses option that lives in Legal information settings.
Clicking that option opens module licenses page, which displays every
module by name, filtered to exclude modules without license files.
Clicking a module in the list opens HTMLViewer.

Created ModuleLicensesProvider, a new ContentProvider that serves as a
redirect for the Uris sent to HTMLViewer so that they open asset files.
In order to provide the redirect, the provider will write the license file
to a file in Settings' cache directory when the license does not exist
in the cache or is outdated. The provider then opens that cached file.

Fixes: 135183006
Test: robotests
Change-Id: I7d69da34780c8c4efb150d0c0411078c12bc80d8
2019-06-25 16:01:38 -07:00
Raff Tsai
ab5e959adb Fix icon color in dark mode
am: e30f61f739

Change-Id: I04b540f4ed116601ea72a82dbd79559575e23752
2019-05-27 09:47:10 -07:00
Raff Tsai
e30f61f739 Fix icon color in dark mode
Fixes: 133651524
Test: visual
Change-Id: Ic6f05dc491ad1d49b5cc81e294bf91271420d8e2
2019-05-27 18:32:35 +08:00
Stanley Wang
68ce56b016 Merge "Fix Settings crashing while displaying phone number slice." into qt-dev
am: 3da9f727e3

Change-Id: I3b33d3cf0509d3c1091dfcfc39df00bbb1441933
2019-05-23 02:04:24 -07:00
Stanley Wang
ae78184c5f Fix Settings crashing while displaying phone number slice.
Check if the SubscriptionInfo list is empty to avoid the IndexOutOfBoundsException.

Fixes: 133258244
Test: maunal & robotest

Change-Id: I837f6761ba2b53823f0126f734f65875a30e34dd
2019-05-22 16:50:52 +08:00
Antony Sargent
bf5f0e77b4 Merge "Prevent NullPointerException in SimStatusDialogController" into qt-dev
am: e959c201ce

Change-Id: I8992b985d6d58e23e1d566e08f07808e60438288
2019-05-22 00:57:19 -07:00
Antony Sargent
5c46d93bd8 Prevent NullPointerException in SimStatusDialogController
In rare cases the SignalStrength we get for a SIM can be null, which
wasn't checked for in this code. This CL adds a null check and fixes the
tests so it's possible to verify the fix (one of the methods that would
have crashed was being spy'd over unnecessarily).

Fixes: 132570076
Test: make RunSettingsRobotests
Change-Id: Ifdec24f184ee2d93e5e242eb2c20695249992fc6
2019-05-21 10:02:10 -07:00
Colin Cross
341544f133 Merge "Use if instead of switch for resources" into qt-dev-plus-aosp 2019-05-14 23:33:25 +00:00
Andy Chou
e553afa7f3 Merge "Fix IMEI information can't display without pSIM inserted" into qt-dev 2019-05-14 03:32:26 +00:00
Colin Cross
807e861105 Use if instead of switch for resources
Converting to Soong will move some code from directly compiled
into the app to compiled into an Android library and then
shared between the app and the tests.  This will cause resource
IDs in the library to become non-final, which means they can
no longer be used in case statements.  Convert affect case
statements to if blocks.

Test: m RunSettingsRoboTests
Change-Id: I25742a374f06d3fa4decbfc0d223a350acc50881
2019-05-13 13:42:01 -07:00
andychou
9ac6d81177 Fix IMEI information can't display without pSIM inserted
When no SIM, we can't get active subscription info.
So current code will not create TelephonyManager and cause IMEI not
retrieved.
Create TelephonyManager with default if no subscription info.

Bug: 132215720
Test: test with SIM and without SIM to check SIM status UI and atest ImeiInfoDialogControllerTest pass
Change-Id: Iaeb932ea66a6bee77136251941cca657984e456f
2019-05-14 00:55:47 +08:00
Pengquan Meng
b73d3c70c8 Merge "Fixed network name for about/sim_status" into qt-dev 2019-05-10 06:10:48 +00:00
Pengquan Meng
0ab776f69d Fixed network name for about/sim_status
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.

Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
JeiFeng Lee
7bc5f91289 [PATCH] Buttons in storage settings
Due to changes in layout of storage wizard base,
2 extra buttons are shown on progress screen while formatting SD card
and also on other screens which have storage wizard base as their super class.
Hence when these buttons were clicked unsupported exception takes place.
Hide these unnecessary next/back buttons from all screen so that user cannot click these.

Fixes: 131779469
Test: manual
Change-Id: I235a180627e68bbb38f4ed4e7ac58ae38838c8d7
Signed-off-by: JeiFeng Lee <linger.lee@mediatek.com>
2019-05-07 09:14:40 +08:00
Fan Zhang
f61db6e9d7 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Fixes: 129038597
Test: robotest
Change-Id: If4277c425e6145e0e3ba716551d0dce46cdb61ab
2019-04-26 10:07:07 -07:00
Andy Chou
8c16ef2906 Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev 2019-04-26 15:04:25 +00:00
andychou
7c89a929c4 Avoid IMEI overrided by getSummary() for dual SIM condition
IMEI information will be overrided by getSummary() and cause second slot IMEI is
oerrided by first slot.
Avoid IMEI is override by first slot information.

Bug: 131124169
Test: Test with dual SIM device and atest
ImeiInfoPreferenceControllerTest, ImeiInfoDialogControllerTest pass

Change-Id: Ia0a028aa0103867f42fff610129cf7ce2d3910b7
2019-04-26 09:31:43 +08:00
andychou
6185e381e0 Fix incorrect mapping to get subscriptioninfo
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Bug: 131123246
Test: Test with dual SIM device and atest SimStatusDialogControllerTest
pass

Change-Id: If7140f602571a5cb8dcdfff939bd84ccff0b482f
2019-04-24 23:18:51 +08:00
Stanley Wang
7f46c8714e Merge "Hardware version should should support copy action" into qt-dev 2019-04-19 07:35:46 +00:00
Stanley Wang
0fdf78cff6 Hardware version should should support copy action
Implement isSliceable method in HardwareRevisionPreferenceController

Fixes: 130653205
Test: manual and robotests
Change-Id: Ib872b9625c2c1984ff7b036fef5b3145c7fd8d2a
2019-04-19 11:52:32 +08:00
Fan Zhang
6dade8e430 Move "Build Number" slice to a different controller.
There are 2 build number tiles in settings: Android version -> Build
number and About phone -> build number.

The way we index breadcrumb for each slice is making some client
confused. So this change moves the slice capability from Androi
version>BuildNumber to About phone.

Fixes: 130652710
Test: reindex, robotest
Change-Id: I9054d0db124b706e7984cd3d19774bb604bd7fd3
2019-04-18 09:37:15 -07:00
Shibin George
a2f013dacb Gracefully handle the case where private volume may be unmountable
If sdcard was removed while format(as phone storage) was
under progress, blkid can fail to identify the UUID of the
private volume. The PrivateStorageInfo.getTotalSize() API
assumes UUID to be always valid which could simply be not the case.
Avoid calling getTotalSize() on private volume when its state
is unmountable.

Bug: 130203877

Test: 1) Insert sdcard as "portable" storage.
      2) Format it as "phone" storage.
      3) Remove the sdcard while format is in progress.
      4) Insert sdcard again -> blkid may fail to id the sdcard.
         In such case, the fsUuid of the private-volume will be reported as "".
      5) Open "Storage Settings". Settings app crashes:

       FATAL EXCEPTION: main
       Process: com.android.settings, PID: 3700
       ...
       Caused by: java.lang.IllegalArgumentException: Invalid UUID string:
       at java.util.UUID.fromString(UUID.java:194)
       at android.os.storage.StorageManager.convert(StorageManager.java:2139)
       at android.app.usage.StorageStatsManager.getTotalBytes(StorageStatsManager.java:121)
       at com.android.settingslib.deviceinfo.PrivateStorageInfo.getTotalSize(PrivateStorageInfo.java:64)

         However, with this CL, "Storage Settings" can be opened
         and the private volume's state is correctly reflected as "Corrupted".
         User can choose to format the volume again.

Copyright (c) 2019 Qualcomm Innovation Center, Inc. All Rights Reserved.

Change-Id: I764603b5806f43f0c6d398f9d6803646774cd912
2019-04-10 10:07:44 -07:00
Fan Zhang
d8b316f816 Remove mainline module feature flag checks.
They are turned on for a while now.

Fixes: 123648279
Test: robotests
Change-Id: Ibec7a10d49387207697635190a237807f1807628
2019-04-05 14:31:04 -07:00
TreeHugger Robot
1382660313 Merge "Convert xml based API allowDynamicSummaryInSlice to java" 2019-04-03 19:42:25 +00:00
Fan Zhang
b1b07e2030 Convert xml based API allowDynamicSummaryInSlice to java
- Add boolean useDynamicSliceSummary() in Sliceable interface. This is
  the switch equivalent to android:allowDynamicSummaryInSlice in xml. It
  moves the setter closer to regular Sliceable APIs, thus less easily to
  miss.
- Coverted all android:allowDynamicSummaryInSlice to use the java API.
  - Except 2 prefs in my_device_info. They incorrectly set this to true
  previously (controller is not sliceable, no point setting
  dynamicSliceSummary to true. They just won't do anything)

Fixes: 128446156
Test: robolectric
Change-Id: Ic57acd590dec3e87dcf4592df137321d14b854d9
2019-04-01 12:39:30 -07:00
lindatseng
3debd0691d Tint icon colors of storage screen same as other screen
We were using hard-coded colors to tint the icons on storage screen
for some reasons.  Change it to the same way we tint other icons,
as there's no reason to keep it special, and also per partner's
request to keep it consistent with other screens.

Also update the ic_sim_sd icon from png to vectors.

Test: Manual/Visual verification
BUG: 113977374
Change-Id: Ia0210635e936b6798aaf9e48dd8815a197396065
2019-04-01 19:15:14 +00:00
TreeHugger Robot
7b571b7018 Merge "Update Model pref subtext to remove redundant prefix" 2019-03-29 06:11:33 +00:00
lindatseng
b38e333535 Update Model pref subtext to remove redundant prefix
Remove "Model: " prefix from the description of Model pref in
About phone > Model & hardware > Model

Test: Visual veridication
Fixes: 128622275
Change-Id: I8fb077809e13fded0370271e899163a7f4103f98
2019-03-28 17:27:58 -07:00
Pasty Chang
a71dfa5ac2 Merge "Set attribute sucUsePartnerResource" 2019-03-27 12:07:40 +00:00
Fan Zhang
5911fe6188 Deep link to detail UI when mainline module version is clicked.
Fixes: 129287281
Test: robotests
Change-Id: I875cf39936dd8cc656aba9e30dc03c882ee13d4a
2019-03-26 13:54:37 -07:00
pastychang
fefc66853b Set attribute sucUsePartnerResource
Add the attribute for all pages apply gliflayout of setupdesign library.
In addition, set the value false to remove stencil theme customization for outside setupwizard flow.

Test: atest
Bug: 128961334
Bug: 128364683
Change-Id: If55e9bf97970a5cd08d8d426747c483d80565559
2019-03-26 09:00:49 +08:00
chen xu
96d0c484f3 Create TM for each subId to register phonestatelistner
To register phonestatelistner for different subscription, do not
create phonestatelistener(subId) this contructor is going to be removed.
instead, create TelephonyManager instance for each subId and pass
separate phonestateListener object.

Bug: 117555407
Test: Maunal test
Change-Id: Ia2a1be6e559c3a5b98e178a02d0eee14cc14eb47
2019-03-20 17:28:26 -07:00
Fan Zhang
e2eefcd163 Suppress search from one of the build number prefs.
And make the search-enabled one copyable.

Fixes: 127962713
Test: search
Change-Id: I0867ea8a376e3aac5e94cd70245833b516bb154d
2019-03-12 15:54:52 -07:00
TreeHugger Robot
588502158d Merge "Check euiccManager available before update EID" 2019-03-02 00:57:26 +00:00