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

Merge "Fix items in StorageProfileFragment can not be clicked"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-21 07:16:24 +00:00
committed by Android (Google) Code Review
parent ade3cc7b49 b5a56789b3
commit e97e65cb76
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
View File

@@ -16,14 +16,15 @@
package com.android.settings.dashboard.profileselector; package com.android.settings.dashboard.profileselector;
import android.content.pm.UserInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.deviceinfo.StorageProfileFragment; import com.android.settings.deviceinfo.StorageProfileFragment;
@@ -41,16 +42,11 @@ public class ProfileSelectStorageFragment extends ProfileSelectFragment {
final Fragment storageDashboardFragment = new StorageDashboardFragment(); final Fragment storageDashboardFragment = new StorageDashboardFragment();
storageDashboardFragment.setArguments(storageBundle); storageDashboardFragment.setArguments(storageBundle);
UserInfo targetUser = null; final UserHandle userHandle = Utils.getManagedProfile(UserManager.get(getActivity()));
for (UserInfo info : UserManager.get(getActivity()).getUsers()) { if (userHandle != null) {
if (!info.isPrimary()) { storageBundle.putInt(StorageProfileFragment.USER_ID_EXTRA, userHandle.getIdentifier());
targetUser = info;
break;
}
}
if (targetUser != null) {
storageBundle.putInt(StorageProfileFragment.USER_ID_EXTRA, targetUser.id);
} }
final Fragment storageProfileFragment = new StorageProfileFragment(); final Fragment storageProfileFragment = new StorageProfileFragment();
storageProfileFragment.setArguments(storageBundle); storageProfileFragment.setArguments(storageBundle);