Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89cea6b5 authored by Fan Zhang's avatar Fan Zhang
Browse files

Convert android version dialog into a full screen UI 

Bug: 112427717
Test: robotests
Change-Id: I09c4130c4284670278fa7cab8a21641c663bb365
parent 4df9bfaa

res/layout/dialog_firmware_version.xml

deleted100644 → 0
+0 −103
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"

            android:background="?android:attr/selectableItemBackground"

            android:textColor="?android:attr/colorAccent"/>



        <TextView

            style="@style/device_info_dialog_label"

            android:id="@+id/module_version_label"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:text="@string/module_version"/>

        <TextView

            style="@style/device_info_dialog_value"

            android:id="@+id/module_version_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

+0 −2
Original line number Diff line number Diff line
@@ -2927,8 +2927,6 @@ 








    <!-- 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] -->
































res/xml/firmware_version.xml
0 → 100644



+73
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  Copyright (C) 2019 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"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="firmware_version_screen"









    android:title="@string/firmware_version"









    settings:keywords="@string/keywords_android_version">



















    <!-- Android version -->









    <Preference









        android:key="os_firmware_version"









        android:title="@string/firmware_version"









        android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:allowDynamicSummaryInSlice="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDetailPreferenceController"/>



















    <!-- Security patch -->









    <Preference









        android:key="security_key"









        android:title="@string/security_patch"









        settings:enableCopying="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelPreferenceController"/>



















    <!-- Mainline module version -->









    <Preference









        android:key="module_version"









        android:title="@string/module_version"









        android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.MainlineModuleVersionPreferenceController"/>



















    <!-- Baseband -->









    <Preference









        android:key="base_band"









        android:title="@string/baseband_version"









        android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.BasebandVersionPreferenceController"/>



















    <!-- Kernel -->









    <Preference









        android:key="kernel_version"









        android:title="@string/kernel_version"









        android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.KernelVersionPreferenceController"/>



















    <!-- Build -->









    <Preference









        android:key="os_build_number"









        android:title="@string/build_number"









        android:summary="@string/summary_placeholder"









        settings:enableCopying="true"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.SimpleBuildNumberPreferenceController"/>



















</PreferenceScreen>








 No newline at end of file
























res/xml/my_device_info.xml



+2
−3






























Original line number
Diff line number
Diff line







@@ -121,11 +121,10 @@







        android:key="firmware_version"









        android:order="32"









        android:title="@string/firmware_version"









        settings:keywords="@string/keywords_android_version"









        android:summary="@string/summary_placeholder"









        settings:allowDynamicSummaryInSlice="true"









        settings:controller=









            "com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>









        android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"









        settings:controller="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController"/>



















    <!--IP address -->









    <Preference
































src/com/android/settings/core/gateway/SettingsGateway.java



+3
−1






























Original line number
Diff line number
Diff line







@@ -49,9 +49,9 @@ import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSe







import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;









import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings;









import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;









import com.android.settings.backup.UserBackupSettingsActivity;









import com.android.settings.backup.PrivacySettings;









import com.android.settings.backup.ToggleBackupSettingFragment;









import com.android.settings.backup.UserBackupSettingsActivity;









import com.android.settings.biometrics.face.FaceSettings;









import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;









import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;








@@ -68,6 +68,7 @@ import com.android.settings.deviceinfo.PublicVolumeSettings;







import com.android.settings.deviceinfo.StorageDashboardFragment;









import com.android.settings.deviceinfo.StorageSettings;









import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;









import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;









import com.android.settings.display.NightDisplaySettings;









import com.android.settings.dream.DreamSettings;









import com.android.settings.enterprise.EnterprisePrivacySettings;








@@ -165,6 +166,7 @@ public class SettingsGateway {







            DisplaySettings.class.getName(),









            MyDeviceInfoFragment.class.getName(),









            ManageApplications.class.getName(),









            FirmwareVersionSettings.class.getName(),









            ManageAssist.class.getName(),









            ProcessStatsUi.class.getName(),









            NotificationStation.class.getName(),