Commit Graph

1256 Commits

Author SHA1 Message Date
Takamasa Kuramitsu
ec01e260fb Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e
am: 7cb8223ce2

Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d
2018-10-12 14:21:52 -07:00
Takamasa Kuramitsu
d77dfa200e Merge "Move content later button doesn't work on Migration Wizard"
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
2018-10-12 14:07:25 -07:00
Mill Chen
0432a46627 Add storage slice in Contextual Settings Homepage
- Add storage card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for storage slice.

Bug: 117074909, 115971399
Test: visual, robotest, SliceBrowser
Change-Id: Idc7d47ba934c2556c124220545ecc73fb2beb7e2
2018-10-09 15:20:29 +08:00
Niklas Lindgren
8fdf33d50a Start using CarrierConfig for 4G/LTE icon
Icon will be updated on sim swap or in case
the default data SIM changes.

Test: Add configs in vendor xml and swap between sim cards.
Tested on both single sim and dual sim.
Bug: 113309356
Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5
2018-10-04 09:42:27 +02:00
Takamasa Kuramitsu
a88ed48cb8 Make migrate option menu invisible when src volume is not mounted
When the adopted media storage is ejected, migrate operation from
adopted storage to internal storage always fails.

This CL makes the migrate option menu invisible when the source
volume of migration is not mounted and not accessible.

Bug: 117178027
Test: Settings robotests & manual
Change-Id: I8bfc9de552a8daf861315a5e46ee520ede14dd81
2018-10-03 10:16:54 +09:00
TreeHugger Robot
ab7dba0d97 Merge "Support phone number in Settings slices" 2018-10-02 02:43:17 +00:00
Takamasa Kuramitsu
9019343728 Move content later button doesn't work on Migration Wizard
"Move content later" button doesn't work on StorageWizardMigrateConfirm
screen which is shown when end-user try to migrate data from adopted
SD Card to internal storage.

The cause is "Move content later" button triggers to StorageWizardReady
screen but cannot launch because the mDisk is null when the destination
of migration is internal storage.

This CL fixes to just exit StorageWizardMigrateConfirm screen when mDisk
is null.

Bug: 117082495
Test: manual
Change-Id: Iccdccf4dda126d77458b9db35e4ec6ae6a263cb7
2018-10-01 13:57:47 +00:00
tmfang
e402cb2744 Support phone number in Settings slices
- Let controller of phoner number extends BasePreferenceController,
so it can be supported showing slice view by SettingsSliceProvider.

Test: make RunSettingsRoboTests
Bug: 74900516
Change-Id: Id98e6aac981025159a0530c6e0709ba0f2ebcd15
2018-10-01 11:15:02 +08:00
tmfang
4f40a8e287 Support some phone information in Settings slice
- Android version
- Device model

Test: robo test, manual test
Change-Id: Ic047caaf4ab699082f6420ad8fa1d2f455abfcb0
Fixes: 74900516
2018-10-01 10:38:21 +08:00
Raff Tsai
b20bfc949a Fix popup dialog show wrong device name
- Current EditText value will set to preference text if we click
OK in EditTextPreferenceDialogFragment. We will set preference
text to default when click cancel in DeviceNameWarningDialog.

Change-Id: Iab9561953b58276e98ee68d9196fa18e0dc3d78c
Fixes: 115693838
Test: make RunSettingsRoboTests
2018-09-14 23:53:30 +08:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
Fan Zhang
c21f4a512a Merge "Sort imports" 2018-08-29 00:19:53 +00:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
SongFerng Wang
937b8172b2 Merge "SIM status page sync signal strength and service state behavior from systemUI" 2018-08-28 02:40:02 +00:00
TreeHugger Robot
58cf5265cc Merge "Check StorageWizardFormatConfirm runs smoothly" 2018-08-23 15:56:18 +00:00
TreeHugger Robot
99e388613d Merge "Check getLastCustomNonConfigurationInstance() works well" 2018-08-23 15:52:00 +00:00
Mill Chen
5b05ebb46b Check StorageWizardFormatConfirm runs smoothly
- confirm that StorageWizardFormatConfirm works well after
  changing calling method from showAllowingStateLoss() to show().

Bug: 111150236
Test: manual
Change-Id: I0ad6c54aaa2572fc5798ede900e0a6d10d2fbd35
2018-08-23 20:58:04 +08:00
SongFerngWang
c6d5a0cb6a SIM status page sync signal strength and service state behavior from systemUI
To make behavior consistent in the long run and refactor the code
into settingslib and call it from both Settings and SystemUI.

Bug: 110973964
Test: run testcase and do manual test - test case as below:
1. Testcase: packages/apps/Settings: -> ALL PASS
make RunSettingsRoboTests ROBOTEST_FILTER=SimStatusDialogControllerTest
2. Fake the service state's voice and data value,voice is out of service
and data is in-service,and then check service state and signal strength
at sim status page -> PASS

Change-Id: I4cc454b6b3d4242af4805e2878f9d46ce28649ad
2018-08-23 19:14:26 +08:00
Mill Chen
810496aa15 Check getLastCustomNonConfigurationInstance() works well
- make sure that StorageWizardFormatProgress runs smoothly.
- confirm that mTask has the same object id when changing the screen
orientation.

Bug: 111151113
Test: manual
Change-Id: I730c1b0f08e8a20a1aafa668fb02cd5a09fdd70a
2018-08-23 14:27:49 +08:00
Fan Zhang
9ce4a1fcde Use searchable="false" to suppress nonIndexables.
When possible, remove or simplify getNonIndexable() logic in fragments,
and use searchable="false" in xml to suppress index.

Change-Id: I5bdf5bc7d5494a64cdd9e230a51321a4b210af69
Fixes: 112608186
Test: robotest and manual search
2018-08-17 09:21:05 -07:00
Fan Zhang
f6747a2f44 Add summary text for more top level setting tiles
- Connected devices
- App & notifs
- Battery

Bug: 110405144
Test: robotests
Change-Id: Ife44f7c5165483a1bad903ce90a241108ab5da25
2018-08-09 14:38:52 -07:00
TreeHugger Robot
1b47c056b2 Merge "Use BluetoothAdapter instead of LocalBluetoothAdapter" 2018-07-31 04:54:43 +00:00
hughchen
e94b02206e Use BluetoothAdapter instead of LocalBluetoothAdapter
LocalBluetoothAdapter only has a few APIs that is not supported
by BluetoothAdapter, and lots of LocalBluetoothAdapter function
pass parameter to BluetoothAdapter directly.
Do the refactor in Settings, use BluetoothAdapter instead of
LocalBluetoothAdapter.

Bug: 111769754
Test: make -j42 RunSettingsRoboTests
Change-Id: I88e5a8377b5d1106c7679e6a8c3fd1ca1a80ea6f
2018-07-31 11:35:36 +08:00
Prabir Pradhan
ee8bf5d463 Merge "Add a boolean flag to show or hide the device name in About device." 2018-07-26 05:24:49 +00:00
Prabir Pradhan
7758fcc6dd Add a boolean flag to show or hide the device name in About device.
The following boolean flag is added:
config_show_device_name

When set to false, the device name will not be shown in System > About
Device.

Bug: 111653180
Test: Updated robotests
Change-Id: Id9610e2009604c9d9693428adff01adc7d606565
2018-07-25 17:06:21 -07:00
Doris Ling
d526c973f6 Restore the up time preference.
- up time preference is removed when we updated to the new version of
about phone settings. Add it back to the preference xml, and restore the
controller for it.

Change-Id: I245316e84d04f9d6f033377c944b615dd6e138a5
Fixes: 111828610
Test: manual
2018-07-25 16:43:40 -07:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00
tmfang
27c84de325 Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00
Jeff Sharkey
9a3bac25fd Disable "internal" when adoption not possible.
When adoption isn't possible, we shortcut to try formatting as
external, but that still results in a warning dialog that the user
could cancel away from and then manually pick "internal."

Bug: 110863258
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I04645c3fce11a883c10996772d73440a0dcd51ec
2018-06-28 11:56:37 -06:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
lumark
9e25726593 Fix back stack didn't perserved when Files Activity launched by Setting storage then back case.
Due to FilesActivity set "android:documentLaunchMode="intoExisting", it will create
new task when launched from Storage Setting page.

When select FilesActivity task from recents & press back key, it will not back
to settings page.

Using startActivityForResult to set task as source task can fix task separated case.

Change-Id: I26362928261a1a9c0e485a486be493423d1fcf61
Fixes: 33117269
Test: Manual
Test: atest StorageItemPreferenceControllerTest
2018-06-12 11:21:45 +08:00
Matthew Fritze
6a03db093a Don't crash if IMEI is empty
Change-Id: I5993d332dbd218c981ef5432aebb735d0000f67a
Fixes: 109787187
Test: robotests
2018-06-08 10:49:06 -07:00
TreeHugger Robot
ad90960b6e Merge "delete DeviceInfoSettings and activity, pref xml" 2018-05-30 20:14:50 +00:00
Fan Zhang
e2f520bcaf Update storage header background to colorPrimary
Change-Id: I07f78cc6452846829b92d25fe9c41c6efe40a459
Merged-In: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
Fixes: 79773433
Test: visual
2018-05-24 17:50:33 +00:00
Antony Sargent
507fe6d909 Merge "Update storage, videogame, and vpn icons" into pi-dev am: 28dc3917a9
am: e3ce1df654

Change-Id: Ic5906d22df49ca2236727c7edcd6192426795fcb
2018-05-23 16:00:31 -07:00
Antony Sargent
49e1397451 Update storage, videogame, and vpn icons
Also remove duplicate ic_settings_storage.xml, rename
ic_settings_storage_white.xml to ic_storage_white.xml, and fix up
references.

Bug: 77982107
Test: manual
Change-Id: Icd78c2a2a8d200cb8819d58887455883acdbc668
2018-05-22 17:35:52 -07:00
Jason Chang
a76797e756 [SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors.
Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors and change every callers entry.

Bug: 78215054
Test: manually test for UI
Change-Id: Ie201aee439bd9e8337eca989b4cdc836a6e8e917
2018-05-21 17:23:41 +08:00
Gilbert Lee
0b4722f088 delete DeviceInfoSettings and activity, pref xml
Fixes: 78653510
Test: Manual

Change-Id: I13379f3f7812ceedffc0e9647db15e6358a3dc17
2018-05-20 16:17:43 +08:00
TreeHugger Robot
77d9076158 Merge "Merge Ambient display into Lockscreen settings." 2018-05-16 19:15:40 +00:00
Fan Zhang
30d4d015b5 Merge Ambient display into Lockscreen settings.
And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
2018-05-16 11:24:32 -07:00
Fan Zhang
9648d5799e Merge "Convert Smart Storage to BasePrefController" 2018-05-16 00:21:51 +00:00
tmfang
5c467566f1 Slices feature supports device model.
- Migrate DeviceModelPreferenceController to BasePreferenceController
- Because Slice feature enables strict mode,
  we can't do I/O(DeviceInfoUtils.getMsvSuffix) on main thread.

  Using FutureTask to get around the foreground thread restriction.

- Modify test case for new device model controller.

Test: slice uri > content://android.settings.slices/intent/my_device_model
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest

Change-Id: Idafc132dfa14138ad5a7edd58e63c4b0f644c994
2018-05-14 12:06:47 -07:00
HJ ChangLiao
ee06ef54ca Convert Smart Storage to BasePrefController
Convert Smart Storage (Storage manager) controller:
AutomaticStorageManagementSwitchPreferenceController
to BasePreferenceController for slices

Change-Id: Ieb22cb97cd46a43557dfbdd2c959e87842890fc6
Fixes: 74916013
Test: make RunSettingsRoboTests
2018-05-11 12:25:06 +08:00
android-build-team Robot
02ec86a17b Merge "Establish permanently unavailable settings" 2018-05-09 18:14:32 +00:00
Matthew Fritze
f87a1f3f41 Establish permanently unavailable settings
Distinguish between settings which are permanently unavailable on
the device, and temporarily unavailable. This enables us to restrict
which setting slices are exposed in onSliceGetDescendants.

The primary changes in this CL are renaming:
"DISABLED_UNSUPPORTED" -> "UNSUPPORTED_ON_DEVICE"
to be more clear the the setting will cannot be accessed on the device, and,
adding a new enum to encapsulate settings which are currently unavailable, but
could be enabled in the future.

Also remove UNAVAILABLE_UNKNOWN. Devs should never need this enum.

Bug: 78910582
Bug: 79245656
Test: robotests
Change-Id: I58821a6cfd6134b3b351657b6edf5f74ead00643
2018-05-09 08:36:59 -07:00
hjchangliao
e86eec0c07 Rename SubSettingLauncher.setTitle, add java doc
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.

Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes: 78347436
Test: make RunSettingsRoboTests
2018-05-09 10:00:05 +08:00