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

Commit f9402321 authored by Jason Monk's avatar Jason Monk
Browse files

Fix legal info back button 

Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
parent da6a4904

res/xml/about_legal.xml

0 → 100644
+60 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:title="@string/legal_information">



    <!-- Note: The titles given here probably won't be used.  Instead, we programmatically

       fill the title with the label of the activity with the corresponding action.

       If there is not an activity for an action, the item will be removed from the

       list. -->



    <!-- Copyright information -->

    <PreferenceScreen

        android:key="copyright"

        android:title="@string/copyright_title">

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

    </PreferenceScreen>



    <!-- License information -->

    <PreferenceScreen

        android:key="license"

        android:title="@string/license_title">

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

    </PreferenceScreen>



    <!-- Terms and conditions -->

    <PreferenceScreen

        android:key="terms"

        android:title="@string/terms_title">

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

    </PreferenceScreen>



    <!-- System WebView License information -->

    <PreferenceScreen

        android:key="webview_license"

        android:title="@string/webview_license_title">

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

    </PreferenceScreen>



    <Preference

        android:key="wallpaper_attributions"

        android:title="@string/wallpaper_attributions"

        android:summary="@string/wallpaper_attributions_values"

        />



</PreferenceScreen>

res/xml/device_info_settings.xml

+13 −53
Original line number Diff line number Diff line
@@ -44,48 +44,8 @@ 
        <!-- Legal Information -->

        <PreferenceScreen

                android:key="container"

                android:title="@string/legal_information">

                    

            <!-- Note: The titles given here probably won't be used.  Instead, we programmatically

                       fill the title with the label of the activity with the corresponding action.

                       If there is not an activity for an action, the item will be removed from the

                       list. -->



            <!-- Copyright information -->

            <PreferenceScreen

                    android:key="copyright"

                    android:title="@string/copyright_title">

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

            </PreferenceScreen>



            <!-- License information -->

            <PreferenceScreen

                    android:key="license"

                    android:title="@string/license_title">

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

            </PreferenceScreen>



            <!-- Terms and conditions -->

            <PreferenceScreen

                    android:key="terms"

                    android:title="@string/terms_title">

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

            </PreferenceScreen>



            <!-- System WebView License information -->

            <PreferenceScreen

                    android:key="webview_license"

                    android:title="@string/webview_license_title">

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

            </PreferenceScreen>



            <Preference

                    android:key="wallpaper_attributions"

                    android:title="@string/wallpaper_attributions"

                    android:summary="@string/wallpaper_attributions_values"

                    />



        </PreferenceScreen>

                android:title="@string/legal_information"

                android:fragment="com.android.settings.LegalSettings" />



        <PreferenceScreen

                android:key="regulatory_info"

src/com/android/settings/DeviceInfoSettings.java

+1 −47
Original line number Diff line number Diff line
@@ -57,12 +57,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_CONTAINER = "container";

    private static final String KEY_REGULATORY_INFO = "regulatory_info";

    private static final String KEY_TERMS = "terms";

    private static final String KEY_LICENSE = "license";

    private static final String KEY_COPYRIGHT = "copyright";

    private static final String KEY_WEBVIEW_LICENSE = "webview_license";

    private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";

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

    private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux";
@@ -145,19 +140,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
         * info.

         */

        final Activity act = getActivity();

        // These are contained in the "container" preference group

        PreferenceGroup parentPreference = (PreferenceGroup) findPreference(KEY_CONTAINER);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TERMS,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_LICENSE,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);



        // These are contained by the root preference screen

        parentPreference = getPreferenceScreen();

        PreferenceGroup parentPreference = getPreferenceScreen();

        if (UserHandle.myUserId() == UserHandle.USER_OWNER) {

            Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,

                    KEY_SYSTEM_UPDATE_SETTINGS,
@@ -450,18 +435,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
                if (TextUtils.isEmpty(getFeedbackReporterPackage(context))) {

                    keys.add(KEY_DEVICE_FEEDBACK);

                }

                if (!checkIntentAction(context, "android.settings.TERMS")) {

                    keys.add(KEY_TERMS);

                }

                if (!checkIntentAction(context, "android.settings.LICENSE")) {

                    keys.add(KEY_LICENSE);

                }

                if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {

                    keys.add(KEY_COPYRIGHT);

                }

                if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {

                    keys.add(KEY_WEBVIEW_LICENSE);

                }

                if (UserHandle.myUserId() != UserHandle.USER_OWNER) {

                    keys.add(KEY_SYSTEM_UPDATE_SETTINGS);

                }
@@ -475,25 +448,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
            private boolean isPropertyMissing(String property) {

                return SystemProperties.get(property).equals("");

            }



            private boolean checkIntentAction(Context context, String action) {

                final Intent intent = new Intent(action);



                // Find the activity that is in the system image

                final PackageManager pm = context.getPackageManager();

                final List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);

                final int listSize = list.size();



                for (int i = 0; i < listSize; i++) {

                    ResolveInfo resolveInfo = list.get(i);

                    if ((resolveInfo.activityInfo.applicationInfo.flags &

                            ApplicationInfo.FLAG_SYSTEM) != 0) {

                        return true;

                    }

                }



                return false;

            }

        };



}

src/com/android/settings/InstrumentedFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ public abstract class InstrumentedFragment extends PreferenceFragment { 
    // Declare new temporary categories here, starting after this value.

    public static final int UNDECLARED = 100000;



    public static final int ABOUT_LEGAL_SETTINGS = UNDECLARED + 1;



    /**

     * Declare the view of this category.

     *

src/com/android/settings/LegalSettings.java

0 → 100644
+114 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 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;



import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.preference.PreferenceGroup;

import android.provider.SearchIndexableResource;



import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class LegalSettings extends SettingsPreferenceFragment implements Indexable {



    private static final String KEY_TERMS = "terms";

    private static final String KEY_LICENSE = "license";

    private static final String KEY_COPYRIGHT = "copyright";

    private static final String KEY_WEBVIEW_LICENSE = "webview_license";



    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        addPreferencesFromResource(R.xml.about_legal);



        final Activity act = getActivity();

        // These are contained in the "container" preference group

        PreferenceGroup parentPreference = getPreferenceScreen();

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TERMS,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_LICENSE,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_WEBVIEW_LICENSE,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

    }



    @Override

    protected int getMetricsCategory() {

        return InstrumentedFragment.ABOUT_LEGAL_SETTINGS;

    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new BaseSearchIndexProvider() {



            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                final SearchIndexableResource sir = new SearchIndexableResource(context);

                sir.xmlResId = R.xml.about_legal;

                return Arrays.asList(sir);

            }



            @Override

            public List<String> getNonIndexableKeys(Context context) {

                final List<String> keys = new ArrayList<String>();

                if (!checkIntentAction(context, "android.settings.TERMS")) {

                    keys.add(KEY_TERMS);

                }

                if (!checkIntentAction(context, "android.settings.LICENSE")) {

                    keys.add(KEY_LICENSE);

                }

                if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {

                    keys.add(KEY_COPYRIGHT);

                }

                if (!checkIntentAction(context, "android.settings.WEBVIEW_LICENSE")) {

                    keys.add(KEY_WEBVIEW_LICENSE);

                }

                return keys;

            }



            private boolean checkIntentAction(Context context, String action) {

                final Intent intent = new Intent(action);



                // Find the activity that is in the system image

                final PackageManager pm = context.getPackageManager();

                final List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);

                final int listSize = list.size();



                for (int i = 0; i < listSize; i++) {

                    ResolveInfo resolveInfo = list.get(i);

                    if ((resolveInfo.activityInfo.applicationInfo.flags &

                            ApplicationInfo.FLAG_SYSTEM) != 0) {

                        return true;

                    }

                }



                return false;

            }

    };



}