PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mass clean up: don't cast class when not needed.

Browse Source 
Bug: none
Test: rebuild
Change-Id: Ie3f58a3d5ae99ade28a33dcac80c18de90d4d5b2
This commit is contained in:
Fan Zhang
2019-02-14 12:25:29 -08:00
parent 09285d72bd
commit 7db118e367
77 changed files with 153 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
View File

@@ -61,7 +61,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mSwitch = (MasterSwitchPreference) screen.findPreference(getPreferenceKey());
mSwitch = screen.findPreference(getPreferenceKey());
}
@Override

19
src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
View File

@@ -49,8 +49,10 @@ public class SecondaryUserController extends AbstractPreferenceController implem
private static final int USER_PROFILE_INSERTION_LOCATION = 6;
private static final int SIZE_NOT_SET = -1;
private @NonNull UserInfo mUser;
private @Nullable StorageItemPreference mStoragePreference;
private @NonNull
UserInfo mUser;
private @Nullable
StorageItemPreference mStoragePreference;
private Drawable mUserIcon;
private long mSize;
private long mTotalSizeBytes;
@@ -58,7 +60,8 @@ public class SecondaryUserController extends AbstractPreferenceController implem
/**
* Adds the appropriate controllers to a controller list for handling all secondary users on
* a device.
* @param context Context for initializing the preference controllers.
*
* @param context Context for initializing the preference controllers.
* @param userManager UserManagerWrapper for figuring out which controllers to add.
*/
public static List<AbstractPreferenceController> getSecondaryUserControllers(
@@ -91,8 +94,9 @@ public class SecondaryUserController extends AbstractPreferenceController implem
/**
* Constructor for a given secondary user.
*
* @param context Context to initialize the underlying {@link AbstractPreferenceController}.
* @param info {@link UserInfo} for the secondary user which this controllers covers.
* @param info {@link UserInfo} for the secondary user which this controllers covers.
*/
@VisibleForTesting
SecondaryUserController(Context context, @NonNull UserInfo info) {
@@ -107,7 +111,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem
mStoragePreference = new StorageItemPreference(screen.getContext());
PreferenceGroup group =
(PreferenceGroup) screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
mStoragePreference.setTitle(mUser.name);
mStoragePreference.setKey(PREFERENCE_KEY_BASE + mUser.id);
if (mSize != SIZE_NOT_SET) {
@@ -140,6 +144,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem
/**
* Sets the size for the preference.
*
* @param size Size in bytes.
*/
public void setSize(long size) {
@@ -151,6 +156,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem
/**
* Sets the total size for the preference for the progress bar.
*
* @param totalSizeBytes Total size in bytes.
*/
public void setTotalSize(long totalSizeBytes) {
@@ -185,8 +191,7 @@ public class SecondaryUserController extends AbstractPreferenceController implem
@Override
public void displayPreference(PreferenceScreen screen) {
PreferenceGroup group =
(PreferenceGroup) screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
final PreferenceGroup group = screen.findPreference(TARGET_PREFERENCE_GROUP_KEY);
if (group == null) {
return;
}

18
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -77,7 +77,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
static final String FILES_KEY = "pref_files";
private final Fragment mFragment;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final StorageVolumeProvider mSvp;
private VolumeInfo mVolume;
private int mUserId;
@@ -225,7 +225,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
private static Drawable applyTint(Context context, Drawable icon) {
TypedArray array =
context.obtainStyledAttributes(new int[] {android.R.attr.colorControlNormal});
context.obtainStyledAttributes(new int[]{android.R.attr.colorControlNormal});
icon = icon.mutate();
icon.setTint(array.getColor(0, 0));
array.recycle();
@@ -235,13 +235,13 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
@Override
public void displayPreference(PreferenceScreen screen) {
mScreen = screen;
mPhotoPreference = (StorageItemPreference) screen.findPreference(PHOTO_KEY);
mAudioPreference = (StorageItemPreference) screen.findPreference(AUDIO_KEY);
mGamePreference = (StorageItemPreference) screen.findPreference(GAME_KEY);
mMoviesPreference = (StorageItemPreference) screen.findPreference(MOVIES_KEY);
mAppPreference = (StorageItemPreference) screen.findPreference(OTHER_APPS_KEY);
mSystemPreference = (StorageItemPreference) screen.findPreference(SYSTEM_KEY);
mFilePreference = (StorageItemPreference) screen.findPreference(FILES_KEY);
mPhotoPreference = screen.findPreference(PHOTO_KEY);
mAudioPreference = screen.findPreference(AUDIO_KEY);
mGamePreference = screen.findPreference(GAME_KEY);
mMoviesPreference = screen.findPreference(MOVIES_KEY);
mAppPreference = screen.findPreference(OTHER_APPS_KEY);
mSystemPreference = screen.findPreference(SYSTEM_KEY);
mFilePreference = screen.findPreference(FILES_KEY);
setFilesPreferenceVisibility();
}

5
src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
View File

@@ -46,7 +46,6 @@ public class StorageSummaryDonutPreferenceController extends AbstractPreferenceC
/**
* Converts a used storage amount to a formatted text.
*
* @param context Context
* @param usedBytes used bytes of storage
* @return a formatted text.
*/
@@ -59,7 +58,7 @@ public class StorageSummaryDonutPreferenceController extends AbstractPreferenceC
@Override
public void displayPreference(PreferenceScreen screen) {
mSummary = (StorageSummaryDonutPreference) screen.findPreference("pref_summary");
mSummary = screen.findPreference("pref_summary");
mSummary.setEnabled(true);
}
@@ -94,7 +93,7 @@ public class StorageSummaryDonutPreferenceController extends AbstractPreferenceC
/**
* Updates the state of the donut preference for the next update.
*
* @param used Total number of used bytes on the summarized volume.
* @param used Total number of used bytes on the summarized volume.
* @param total Total number of bytes on the summarized volume.
*/
public void updateBytes(long used, long total) {