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

Merge "Misc fixes for User page and my device info page"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-26 22:35:35 +00:00
committed by Android (Google) Code Review
parent 1b0d7f14e3 881d579620
commit 7cfd0bfe43
26 changed files with 243 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/dashboard/DashboardFragmentRegistry.java
View File

@@ -20,7 +20,7 @@ import android.util.ArrayMap;
import com.android.settings.DisplaySettings;
import com.android.settings.accounts.AccountDetailDashboardFragment;
import com.android.settings.accounts.UserAndAccountDashboardFragment;
import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.applications.AppAndNotificationDashboardFragment;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
@@ -81,7 +81,7 @@ public class DashboardFragmentRegistry {
CategoryKey.CATEGORY_SECURITY);
PARENT_TO_CATEGORY_KEY_MAP.put(AccountDetailDashboardFragment.class.getName(),
CategoryKey.CATEGORY_ACCOUNT_DETAIL);
PARENT_TO_CATEGORY_KEY_MAP.put(UserAndAccountDashboardFragment.class.getName(),
PARENT_TO_CATEGORY_KEY_MAP.put(AccountDashboardFragment.class.getName(),
CategoryKey.CATEGORY_ACCOUNT);
PARENT_TO_CATEGORY_KEY_MAP.put(
SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);

2
src/com/android/settings/dashboard/conditional/WorkModeCondition.java
View File

@@ -85,7 +85,7 @@ public class WorkModeCondition extends Condition {
@Override
public void onPrimaryClick() {
mManager.getContext().startActivity(new Intent(mManager.getContext(),
Settings.UserAndAccountDashboardActivity.class)
Settings.UserSettingsActivity.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}