Commit Graph

972 Commits

Author SHA1 Message Date
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
Qingxi Li
02f2547482 Check euiccManager available before update EID
Test: E2E & Included
Bug: 126264451
Change-Id: Ic3876567dd139819d67e8b6ddc6f2b6ba03c98fa
2019-02-28 19:53:15 -08:00
Fan Zhang
7c261409d2 Make Serial number preference a copyable slice.
Fixes: 73769621
Test: robotests
Change-Id: Ic20d8865bc26c1acc7db74e665f92fe388d62f74
2019-02-26 13:14:03 -08:00
Fan Zhang
8ae1514299 Make model & hardware UI full screen.
Bug: 112427717
Test: robotests
Change-Id: I9f1edb0ab377aff142b57d86f4fa218b755356b1
2019-02-25 16:36:04 -08:00
Fan Zhang
e0a722e130 Merge Copyable into Sliceable.
It's only a slice concept. Regular preference copyability is handled in
xml.

Bug: 112427717
Test: rebuild
Change-Id: Iaba7077c320cd03a5963797916a60e0dc80fdbbe
2019-02-25 16:36:04 -08:00
Fan Zhang
89cea6b5f2 Convert android version dialog into a full screen UI
Bug: 112427717
Test: robotests
Change-Id: I09c4130c4284670278fa7cab8a21641c663bb365
2019-02-22 16:46:17 -08:00
Fan Zhang
7db118e367 Mass clean up: don't cast class when not needed.
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
2019-02-14 12:26:09 -08:00
Doris Ling
f5fd5c4985 Add feature flag check for mainline module version.
- in about phone settings, only show the mainline module version if the
feature is enabled.

Bug: 122615240
Test: make RunSettingsRoboTests
Change-Id: If872859755dade7e601a47eb387d10c3b247d06e
2019-01-30 12:52:23 -08:00
Fan Zhang
5c3301b0ab Add configs to display/hide a few tiles in device info page
- Displaying/hiding Emergency info, branded account, device header
  widget are now driven by config flags
- Also refactored controllers to use BasePreferenceController

Change-Id: Ie601ebf689e0744c6a05a2cca5513fa43ef355e0
Fixes: 119607340
Test: robotests
2019-01-28 14:44:02 -08:00
Pasty Chang
0c6e676708 Merge "Rename ButtonFooterMixin to FooterBarMixin" 2019-01-25 03:58:56 +00:00
Doris Ling
397f6b4c86 Merge "Add module version in About settings." 2019-01-24 20:20:54 +00:00
pastychang
9bdb59a764 Rename ButtonFooterMixin to FooterBarMixin
1. Change to FooterBarMixin
2. Move FooterButton to the same package with FooterBarMixin

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic6937e3cbc515dd7bf877c9193932cd5800ac801
2019-01-24 16:18:28 +08:00
Fan Zhang
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -08:00
Doris Ling
380e92c54c Add module version in About settings.
Change-Id: I2474d05ee96e3dd29fe012fe77450c91775fdf1d
Fixes: 122615240
Test: make RunSettingsRoboTests
2019-01-17 10:11:28 -08:00
Malcolm Chen
14dde50c3a Don't show hidden Cellular subscription in Settings.
Replace getActiveSubscriptionInfoList() with
getActiveSubscriptionInfoList(true) so that settings will not show
hidden subscriptions to the user in various pages.

Bug: 121396526
Test: manual
Change-Id: I717999fed7d3a5a037914239694bef52df7c6207
2019-01-16 00:21:30 -08:00
Stanley Wang
eb735f2909 Merge "Implement the Copyable interface to ImeiInfoPreferenceController" 2019-01-10 07:01:33 +00:00
Stanley Wang
76ab6e9a99 Implement the Copyable interface to ImeiInfoPreferenceController
Copy the IMEI to clipboard for Copyable.

Change-Id: I3e13bfad8158e4cb4f9fda854661341d4c334e46
Fixes: 73769888
Test: manual and robotests
2019-01-10 04:00:20 +00:00
pastychang
79614823cb Rename prefix from suw to sud
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: I44a399b586671c100cb9d85c97effbfb1a379413
2019-01-04 10:46:20 +08:00
pastychang
908501e40f Apply FooterButton builder
FotterButton constructor in setupcompat will be deprecated, change to
use builder.

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic84b0c91205bf3c770bc658e8eaf2626e4d7bddd
2018-12-26 14:56:44 +08:00
Stanley Wang
847c0660a5 Implement the Copyable interface to FirmwareVersionPreferenceController
Copy the device version number to clipboard for Copyable.

Change-Id: Ibb687be442dd702c1197c7e8295fac5b914a7047
Fixes: 121463656
Test: manual and robotests
2018-12-25 11:04:16 +00:00
Stanley Wang
2beb5442bb Merge "Implement the Copyable interface to BuildNumberPreferenceController" 2018-12-21 10:39:47 +00:00
Stanley Wang
118a712486 Implement the Copyable interface to BuildNumberPreferenceController
Fixes: 121233543
Test: manual and robotests
Change-Id: I4f424be6dfeb2c9fc9ac0bc11b38139f7d52b2b7
2018-12-21 10:57:45 +08:00
pastychang
28fd9b102b Migrating to new footer button for storage migrated pages
Remove unused files storage_wizard_ready.xml and storage_wizard_navigation.xml

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ie3f0023413244dfc2b3f8dddae42977c920e93ac
2018-12-20 22:44:20 +08:00
Stanley Wang
3f80d1b64b Implement the Copyable interface to PhoneNumberPreferenceController
Change-Id: I70085cffe13047ac808d1bf08a467f693b1d8737
Fixes: 118398321
Test: manual and robotests
2018-12-14 15:09:34 +08:00