Merge "Add user and account dashboard category for new IA." (7fa8b437) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+23 −0

Original line number	Diff line number	Diff line
		@@ -3364,6 +3364,29 @@
		android:value="true" />
		</activity-alias>

		<activity android:name=".Settings$UserAndAccountDashboardActivity"
		android:label="@string/account_dashboard_title"
		android:icon="@drawable/ic_settings_accounts">
		<intent-filter android:priority="2">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.accounts.UserAndAccountDashboardFragment"/>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.homepage"/>
		</activity>

		<activity-alias android:name="UserDashboardAlias"
		android:targetActivity="Settings$UserSettingsActivity">
		<intent-filter android:priority="8">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.users.UserSettings" />
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.accounts" />
		</activity-alias>

		<!-- End of information architecture host activities -->

		<service

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -5931,6 +5931,8 @@
		<string name="connected_devices_dashboard_title">Connected devices</string>
		<!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
		<string name="app_and_notification_dashboard_title">Apps & notifications</string>
		<!-- Title for setting tile leading to User and accounts settings [CHAR LIMIT=40]-->
		<string name="account_dashboard_title">User & accounts</string>
		<!-- Summary text for system preference tile, showing current display language of device [CHAR LIMIT=NONE]-->
		<string name="system_dashboard_summary">Language: <xliff:g id="language">%1$s</xliff:g></string>

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ public class Settings extends SettingsActivity {
		public static class ConnectedDeviceDashboardActivity extends SettingsActivity {}
		public static class AppAndNotificationDashboardActivity extends SettingsActivity {}
		public static class StorageDashboardActivity extends SettingsActivity {}
		public static class UserAndAccountDashboardActivity extends SettingsActivity {}
		public static class SystemDashboardActivity extends SettingsActivity {}
		public static class SupportDashboardActivity extends SettingsActivity {}

src/com/android/settings/SettingsActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import com.android.settings.accounts.AccountSettings;
		import com.android.settings.accounts.AccountSyncSettings;
		import com.android.settings.accounts.ChooseAccountActivity;
		import com.android.settings.accounts.ManagedProfileSettings;
		import com.android.settings.accounts.UserAndAccountDashboardFragment;
		import com.android.settings.applications.AppAndNotificationDashboardFragment;
		import com.android.settings.applications.AdvancedAppSettings;
		import com.android.settings.applications.DrawOverlayDetails;
		@@ -279,6 +280,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		"com.android.settings.Settings.DisplayDashboardAlias",
		"com.android.settings.Settings.SoundDashboardAlias",
		"com.android.settings.Settings.SecurityDashboardAlias",
		Settings.UserAndAccountDashboardActivity.class.getName(),
		Settings.SystemDashboardActivity.class.getName(),
		Settings.SupportDashboardActivity.class.getName(),
		// Home page > Apps & Notifications
		@@ -396,6 +398,7 @@ public class SettingsActivity extends SettingsDrawerActivity
		NetworkDashboardFragment.class.getName(),
		ConnectedDeviceDashboardFragment.class.getName(),
		AppAndNotificationDashboardFragment.class.getName(),
		UserAndAccountDashboardFragment.class.getName(),
		};

src/com/android/settings/accounts/UserAndAccountDashboardFragment.java

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings.accounts;

		import android.content.Context;

		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.core.PreferenceController;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settingslib.drawer.CategoryKey;

		import java.util.List;

		public class UserAndAccountDashboardFragment extends DashboardFragment {

		private static final String TAG = "UserAndAccountDashboard";

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.ACCOUNT;
		}

		@Override
		protected String getCategoryKey() {
		return CategoryKey.CATEGORY_ACCOUNT;
		}

		@Override
		protected String getLogTag() {
		return TAG;
		}

		@Override
		protected int getPreferenceScreenResId() {
		return R.xml.account_settings;
		}

		@Override
		protected List<PreferenceController> getPreferenceControllers(Context context) {
		return null;
		}

		}
		No newline at end of file