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

Commit ae8aea76 authored by Zach Kuznia's avatar Zach Kuznia Committed by Android (Google) Code Review
Browse files

Merge "Allow manual to be read from disk" into mnc-dr-dev

parents 1207a501 5adcb3d3

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -2419,6 +2419,19 @@ 
                android:resource="@id/notification_settings" />

        </activity>



        <!-- Show Manual (from settings item) -->

        <activity android:name="ManualDisplayActivity"

                  android:label="@string/manual"

                  android:taskAffinity=""

                  android:enabled="@bool/config_show_manual">

            <intent-filter>

                <action android:name="android.settings.SHOW_MANUAL" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <!-- Show regulatory info (from settings item or dialing "*#07#") -->

        <activity android:name="RegulatoryInfoDisplayActivity"

                  android:label="@string/regulatory_information"

res/values/bools.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
         Can be overridden for specific product builds. -->

    <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>



    <!-- Whether to show a preference item for the manual in About phone -->

    <bool name="config_show_manual">false</bool>

    <!-- Whether to show a preference item for regulatory information in About phone -->

    <bool name="config_show_regulatory_info">false</bool>

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -2880,6 +2880,8 @@ 
    <string name="legal_information">Legal information</string>

    <!-- About phone settings screen, setting option name to see a list of contributors -->

    <string name="contributors_title">Contributors</string>

    <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->

    <string name="manual">Manual</string>

    <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->

    <string name="regulatory_information">Regulatory information</string>

    <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
@@ -2899,6 +2901,11 @@ 
    <!-- About phone settings screen, setting option name to see wallpapers attributions values -->

    <string name="wallpaper_attributions_values">Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>













    <!-- Phone Manual -->













    <string name="settings_manual_activity_title">Manual</string>













    <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->













    <string name="settings_manual_activity_unavailable">There is a problem loading the manual.</string>



























    <!-- Title for actual Settings license activity. --> <skip />















    <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->















    <string name="settings_license_activity_title">Open source licenses</string>

































res/xml/device_info_settings.xml



+7
−0




























Original line number
Diff line number
Diff line








@@ -41,6 +41,13 @@













                    android:targetClass="com.android.settings.deviceinfo.Status" />















        </PreferenceScreen>





























        <!-- Manual -->













        <PreferenceScreen













                android:key="manual"













                android:title="@string/manual">













            <intent android:action="android.settings.SHOW_MANUAL" />













        </PreferenceScreen>





























        <!-- Legal Information -->















        <PreferenceScreen















                android:key="container"

































src/com/android/settings/DeviceInfoSettings.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -65,6 +65,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In













    private static final String FILENAME_PROC_VERSION = "/proc/version";















    private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";





























    private static final String KEY_MANUAL = "manual";















    private static final String KEY_REGULATORY_INFO = "regulatory_info";















    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";















    private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";










@@ -180,6 +181,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In













        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,















                R.bool.config_additional_system_update_setting_enable);





























        // Remove manual entry if none present.













        removePreferenceIfBoolFalse(KEY_MANUAL, R.bool.config_show_manual);





























        // Remove regulatory information if none present.















        final Intent intent = new Intent(Settings.ACTION_SHOW_REGULATORY_INFO);















        if (getPackageManager().queryIntentActivities(intent, 0).isEmpty()) {