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

Commit 9b3a1f71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow customization of the empty view text."

parents 26d10e24 05c00fa1

res/layout/permissions_frame.xml

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
            android:id="@+id/no_permissions"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:text="@string/no_permissions"

            android:gravity="center"

            style="?android:attr/textAppearanceLarge">

        </TextView>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ 
    <!-- Description for showing permissions accessed in the last 15 minutes [CHAR LIMIT=30] -->

    <string name="permission_usage_last_15_minutes">Last 15 minutes</string>



    <!-- Label when no apps have used the requested permissions [CHAR LIMIT=30] -->

    <string name="no_permission_usages">No permission usages</string>



    <!-- Help URL, permission usage [DO NOT TRANSLATE] -->

    <string name="help_permission_usage" translatable="false"></string>

src/com/android/packageinstaller/permission/ui/handheld/PermissionUsageFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ public class PermissionUsageFragment extends PermissionsFrameFragment implements 
        setLoading(false, true);

    }



    @Override

    public int getEmptyViewString() {

        return R.string.no_permission_usages;

    }



    private void addPreferences() {

        PreferenceScreen screen = getPreferenceScreen();

        if (screen == null) {

src/com/android/packageinstaller/permission/ui/handheld/PermissionsFrameFragment.java

+8 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat 
            mPrefsView = rootView;

        }

        mEmptyView = mPrefsView.findViewById(R.id.no_permissions);

        mEmptyView.setText(getEmptyViewString());

        mLoadingView = rootView.findViewById(R.id.loading_container);

        mPreferencesContainer = (ViewGroup) super.onCreateView(

                inflater, mPrefsView, savedInstanceState);
@@ -208,4 +209,11 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat 
            view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);

        }

    }



    /**

     * @return the id of the string to display when there are no entries to show.

     */

    public int getEmptyViewString() {

        return R.string.no_permissions;

    }

}

src/com/android/packageinstaller/permission/ui/television/PermissionsFrameFragment.java

+7 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
package com.android.packageinstaller.permission.ui.television;



import android.os.Bundle;

import androidx.annotation.Nullable;

import androidx.preference.PreferenceFragment;

import androidx.leanback.widget.VerticalGridView;

import androidx.preference.PreferenceScreen;

import androidx.recyclerview.widget.RecyclerView;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -30,6 +25,12 @@ import android.view.animation.Animation.AnimationListener; 
import android.view.animation.AnimationUtils;

import android.widget.TextView;



import androidx.annotation.Nullable;

import androidx.leanback.widget.VerticalGridView;

import androidx.preference.PreferenceFragment;

import androidx.preference.PreferenceScreen;

import androidx.recyclerview.widget.RecyclerView;



import com.android.permissioncontroller.R;



public abstract class PermissionsFrameFragment extends PreferenceFragment {
@@ -147,6 +148,7 @@ public abstract class PermissionsFrameFragment extends PreferenceFragment { 


        if (adapter != null) {

            final TextView emptyView = (TextView) getView().findViewById(R.id.no_permissions);

            emptyView.setText(R.string.no_permissions);

            onSetEmptyText(emptyView);

            final RecyclerView recyclerView = getListView();

            adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {