Merge "Add a new About Phone page." (06af7c8d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+28 −0

Original line number	Diff line number	Diff line
		@@ -1004,6 +1004,34 @@
		android:value="true" />
		</activity>


		<activity android:name="Settings$MeCardActivity"
		android:label="@string/device_info_settings"
		android:icon="@drawable/ic_settings_about"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.DEVICE_HEALTH_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.VOICE_LAUNCH" />
		</intent-filter>
		<intent-filter android:priority="10">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.category"
		android:value="com.android.settings.category.ia.system" />
		<meta-data android:name="com.android.settings.title"
		android:resource="@string/about_settings" />
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.MeCardFragment" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<activity android:name="SettingsLicenseActivity"
		android:label="@string/settings_license_activity_title"
		android:theme="@android:style/Theme.DeviceDefault.Light.Panel"

res/values/strings.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -9223,4 +9223,15 @@
		[DO NOT TRANSLATE] -->
		<string name="account_confirmation_package"></string>

		<!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
		<string name="me_card_title" product="default">My Phone</string>
		<!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
		<string name="me_card_title" product="tablet">My Tablet</string>
		<!-- Title for the new About Phone screen [CHAR LIMIT=40] -->
		<string name="me_card_title" product="device">My Device</string>
		<!-- Title for preference showing the primary account on the device [CHAR LIMIT=60]-->
		<string name="me_card_account_preference_title">Account</string>
		<!-- Title for preference showing the name of the device. [CHAR LIMIT=60]-->
		<string name="me_card_device_name_preference_title">Device name</string>

		</resources>

res/xml/me_card.xml

0 → 100644

+50 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 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.
		-->

		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:key="me_card_pref_screen"
		android:title="@string/me_card_title">

		<com.android.settings.applications.LayoutPreference
		android:key="me_card_header"
		android:order="0"
		android:layout="@layout/settings_entity_header"
		android:selectable="false"/>

		<!-- Account name -->
		<Preference
		android:key="account"
		android:order="1"
		android:title="@string/me_card_account_preference_title"
		android:summary="@string/summary_placeholder"/>

		<!-- Phone number -->
		<Preference
		android:key="phone_number"
		android:order="2"
		android:title="@string/status_number"
		android:summary="@string/summary_placeholder"/>

		<!-- Device name -->
		<Preference
		android:key="device_name"
		android:order="3"
		android:title="@string/me_card_device_name_preference_title"
		android:summary="@string/summary_placeholder"/>

		</PreferenceScreen>
		No newline at end of file

src/com/android/settings/MeCardFragment.java

0 → 100644

+137 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import android.app.Activity;
		import android.app.Fragment;
		import android.content.Context;
		import android.content.pm.UserInfo;
		import android.os.Bundle;
		import android.os.UserManager;
		import android.provider.SearchIndexableResource;
		import android.view.View;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.applications.LayoutPreference;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.deviceinfo.BrandedAccountPreferenceController;
		import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.widget.EntityHeaderController;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;

		public class MeCardFragment extends DashboardFragment implements Indexable {
		private static final String LOG_TAG = "MeCardFragment";

		private static final String KEY_ME_CARD_HEADER = "me_card_header";

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

		@Override
		public int getHelpResource() {
		return R.string.help_uri_about;
		}

		@Override
		public void onResume() {
		super.onResume();
		initHeader();
		}

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

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

		@Override
		protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
		return buildPreferenceControllers(context, getActivity(), this /* fragment */,
		getLifecycle());
		}

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
		Activity activity, Fragment fragment, Lifecycle lifecycle) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		controllers.add(new PhoneNumberPreferenceController(context));
		controllers.add(new BrandedAccountPreferenceController(context));
		// TODO: Add preference controller for getting the device name.
		return controllers;
		}

		private void initHeader() {
		// TODO: Migrate into its own controller.
		final LayoutPreference headerPreference =
		(LayoutPreference) getPreferenceScreen().findPreference(KEY_ME_CARD_HEADER);
		final View appSnippet = headerPreference.findViewById(R.id.entity_header);
		final Activity context = getActivity();
		final Bundle bundle = getArguments();
		EntityHeaderController controller = EntityHeaderController
		.newInstance(context, this, appSnippet)
		.setRecyclerView(getListView(), getLifecycle())
		.setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
		EntityHeaderController.ActionType.ACTION_NONE);

		// TODO: There may be an avatar setting action we can use here.
		final int iconId = bundle.getInt("icon_id", 0);
		if (iconId == 0) {
		UserManager userManager = (UserManager) getActivity().getSystemService(
		Context.USER_SERVICE);
		UserInfo info = Utils.getExistingUser(userManager, android.os.Process.myUserHandle());
		controller.setLabel(info.name);
		controller.setIcon(
		com.android.settingslib.Utils.getUserIcon(getActivity(), userManager, info));
		}

		controller.done(context, true /* rebindActions */);
		}

		/**
		* For Search.
		*/
		public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider() {

		@Override
		public List<SearchIndexableResource> getXmlResourcesToIndex(
		Context context, boolean enabled) {
		final SearchIndexableResource sir = new SearchIndexableResource(context);
		sir.xmlResId = R.xml.me_card;
		return Arrays.asList(sir);
		}

		@Override
		public List<AbstractPreferenceController> getPreferenceControllers(
		Context context) {
		return buildPreferenceControllers(context, null /activity /,
		null /* fragment /, null / lifecycle */);
		}
		};
		}

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ public class Settings extends SettingsActivity {
		public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
		public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
		public static class DeviceInfoSettingsActivity extends SettingsActivity { /* empty */ }
		public static class MeCardActivity extends SettingsActivity { /* empty */ }
		public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }
		public static class ManageAssistActivity extends SettingsActivity { /* empty */ }