Merge "Create a dialog for firmware version" (c8b6833e) · Commits · e / os / android_packages_apps_Settings

res/layout/dialog_firmware_version.xml

0 → 100644

+89 −0

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

		<ScrollView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:padding="@dimen/sim_content_padding">

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/firmware_version_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/firmware_version"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/firmware_version_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/security_patch_level_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/security_patch"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/security_patch_level_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/baseband_version_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/baseband_version"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/baseband_version_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/kernel_version_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/kernel_version"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/kernel_version_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		<TextView
		style="@style/device_info_dialog_label"
		android:id="@+id/build_number_label"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:text="@string/build_number"/>
		<TextView
		style="@style/device_info_dialog_value"
		android:id="@+id/build_number_value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"/>

		</LinearLayout>
		</ScrollView>

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -2622,6 +2622,8 @@

		<!-- About phone screen, status item label [CHAR LIMIT=40] -->
		<string name="firmware_version">Android version</string>
		<!-- About phone screen, dialog title for showing device software information such as android version, security patch level, etc [CHAR LIMIT=60] -->
		<string name="firmware_title">Android</string>
		<!-- About phone screen, status item label [CHAR LIMIT=60] -->
		<string name="security_patch">Android security patch level</string>
		<!-- About phone screen, status item label [CHAR LIMIT=40] -->

src/com/android/settings/DeviceInfoSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
		import com.android.settings.deviceinfo.SecurityPatchPreferenceController;
		import com.android.settings.deviceinfo.simstatus.SimStatusDualSimPreferenceController;
		import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;
		import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settingslib.core.AbstractPreferenceController;
		@@ -138,7 +139,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {

		controllers.add(new ImeiInfoDualSimPreferenceController(context, fragment));

		// Android version
		controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));

		// IP address

src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -27,13 +27,17 @@ import android.text.TextUtils;
		import android.util.Log;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnResume;


		/**
		* deprecated in favor of {@link FirmwareVersionPreferenceControllerV2}
		*/
		@Deprecated
		public class FirmwareVersionPreferenceController extends AbstractPreferenceController implements
		PreferenceControllerMixin, LifecycleObserver, OnResume {

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.deviceinfo.firmwareversion;

		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.app.Fragment;
		import android.app.FragmentManager;
		import android.os.Bundle;
		import android.view.LayoutInflater;
		import android.view.View;

		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

		public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment {

		private static final String TAG = "firmwareVersionDialog";

		public static void show(Fragment host) {
		final FragmentManager manager = host.getChildFragmentManager();
		if (manager.findFragmentByTag(TAG) == null) {
		final FirmwareVersionDialogFragment dialog = new FirmwareVersionDialogFragment();
		dialog.show(manager, TAG);
		}
		}

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

		@Override
		public Dialog onCreateDialog(Bundle savedInstanceState) {
		final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
		.setTitle(R.string.firmware_title)
		.setPositiveButton(android.R.string.ok, null /* listener */);

		final View view = LayoutInflater.from(getActivity()).inflate(
		R.layout.dialog_firmware_version, null /* parent */);

		return builder.setView(view).create();
		}
		}