Settings: add omni version in about as preference
Change-Id: Ie7e9ff5a517042c8279ea5d0383e5d60f4abe0c9
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 36dafcf..42078c7 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -24,4 +24,7 @@
<string name="selinux_status_permissive">Permissive</string>
<string name="selinux_status_enforcing">Enforcing</string>
+ <string name="mod_version">Omni version</string>
+ <string name="mod_version_default">Unknown</string>
+
</resources>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 3dc6b98..312ec7d 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -236,10 +236,17 @@
settings:controller="com.android.settings.deviceinfo.BuildNumberPreferenceController"/>
</PreferenceCategory>
+ <!-- omni version -->
+ <Preference
+ android:key="omni_version"
+ android:order="54"
+ android:title="@string/mod_version"
+ android:summary="@string/mod_version_default"/>
+
<!-- SELinux status information -->
<Preference
android:key="selinux_status"
- android:order="54"
+ android:order="55"
android:title="@string/selinux_status"
android:summary="@string/selinux_status_enforcing"/>
diff --git a/src/com/android/settings/deviceinfo/OmniVersionPreferenceController.java b/src/com/android/settings/deviceinfo/OmniVersionPreferenceController.java
new file mode 100644
index 0000000..778c4f9
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/OmniVersionPreferenceController.java
@@ -0,0 +1,58 @@
+/*
+ * 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;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class OmniVersionPreferenceController extends AbstractPreferenceController implements
+ PreferenceControllerMixin {
+
+ private static final String PROPERTY_OMNI_VERSION = "ro.omni.version";
+ private static final String KEY_OMNI_VERSION = "omni_version";
+
+ public OmniVersionPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_OMNI_VERSION));
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_OMNI_VERSION;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final Preference pref = screen.findPreference(KEY_OMNI_VERSION);
+ if (pref == null) {
+ return;
+ }
+ pref.setSummary(SystemProperties.get(PROPERTY_OMNI_VERSION));
+ }
+}
+
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index e146735..62ec4c1 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -35,6 +35,7 @@
import com.android.settings.deviceinfo.FeedbackPreferenceController;
import com.android.settings.deviceinfo.IpAddressPreferenceController;
import com.android.settings.deviceinfo.ManualPreferenceController;
+import com.android.settings.deviceinfo.OmniVersionPreferenceController;
import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
import com.android.settings.deviceinfo.SELinuxStatusPreferenceController;
@@ -127,6 +128,7 @@
controllers.add(new FccEquipmentIdPreferenceController(context));
controllers.add(new UptimePreferenceController(context, lifecycle));
controllers.add(new SELinuxStatusPreferenceController(context));
+ controllers.add(new OmniVersionPreferenceController(context));
Consumer<String> imeiInfoList = imeiKey -> {
ImeiInfoPreferenceController imeiRecord =