Add AOSiP Version to About Phone

Change-Id: I5c1c25e5a5c0545e29cd11db936334effbed9ec5
AOSiP · Jun 16, 2017 · 0779371 · 0779371
1 parent eec9887
commit 0779371
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/res/values/aosip_strings.xml b/res/values/aosip_strings.xml
@@ -56,6 +56,9 @@
     <string name="build_date">Build date</string>
     <string name="build_date_default">2017-01-01-0000</string>
 
+    <!-- AOSiP Version -->
+    <string name="aosip_version">AOSiP Build</string>
+
     <!-- MSIM SIM status -->
     <string name="sim_card_status_title">SIM %d status</string>
     <string name="sim_card_lock_settings_title">SIM %d lock settings</string>

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
@@ -19,9 +19,10 @@
         android:title="@string/about_settings">
 
         <!-- AOSiP About -->
-        <PreferenceScreen android:key="aosip_logo"
+        <PreferenceScreen
+                android:key="aosip_logo"
                 android:layout="@layout/aosip_about"
-		android:fragment="com.android.settings.aosip.AosipAbout" />
+		        android:fragment="com.android.settings.aosip.AosipAbout" />
 
         <!-- System update settings - launches activity
         <PreferenceScreen android:key="system_update_settings"
@@ -38,18 +39,20 @@
                     android:targetClass="@string/additional_system_update_menu" />
         </PreferenceScreen> -->
 
-        <!-- Our OTA Updates
+        <!-- AOSiP version -->
-        <PreferenceScreen android:key="ota_updates"
+        <com.android.settings.DividerPreference
-                android:title="@string/system_update_settings_list_item_title" 
+                android:key="aosip_version"
-                android:summary="@string/system_update_settings_list_item_summary">
+                android:enabled="false"
-            <intent
+                android:shouldDisableView="false"
-                    android:action="android.intent.action.MAIN"
+                android:selectable="false"
-                    android:targetPackage="com.ota.updates"
+                android:title="@string/aosip_version"
-                    android:targetClass="com.ota.updates.activities.MainActivity" />
+                android:summary="@string/device_info_default"
-        </PreferenceScreen> -->
+                settings:allowDividerAbove="true"
+                settings:allowDividerBelow="true"/>
 
         <!-- Device Maintainer -->
-        <Preference android:key="device_maintainer"
+        <Preference 
+                android:key="device_maintainer"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/device_maintainer"
                 android:summary="@string/device_info_default" />

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
@@ -77,6 +77,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
     private static final String PROPERTY_QGP_VERSION = "persist.qgp.version";
     private static final String KEY_DEVICE_MAINTAINER = "device_maintainer";
     private static final String KEY_MOD_BUILD_DATE = "build_date";
+    private static final String KEY_AOSIP_VERSION = "aosip_version";
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
 
@@ -127,6 +128,7 @@ public void onCreate(Bundle icicle) {
         setValueSummary(KEY_QGP_VERSION, PROPERTY_QGP_VERSION);
         setMaintainerSummary(KEY_DEVICE_MAINTAINER, "ro.aosip.maintainer");
         setValueSummary(KEY_MOD_BUILD_DATE, "ro.build.date");
+        setValueSummary(KEY_AOSIP_VERSION, "ro.aosip.version");
         // Remove QGP Version if property is not present
         removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_QGP_VERSION,
                 PROPERTY_QGP_VERSION);