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

Commit 501fde65 authored by Ben Kwa's avatar Ben Kwa Committed by Android (Google) Code Review
Browse files

Merge "Lint fixes and config tweaks."

parents 061371b3 e3aee18d

packages/DocumentsUI/lint.xml

+30 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<lint>

    <!-- min-sdk doesn't apply to platform apps -->

    <!--

        Lint configuration for the framework-lint tool (go/fwlint).  See

        http://tools.android.com/tips/lint for full docs on the lint tool.

    -->



    <!-- min-sdk doesn't apply to platform apps. -->

    <issue id="UsesMinSdkAttributes" severity="ignore" />



    <!-- Protected permissions don't apply to system apps -->

    <!-- Protected permissions don't apply to system apps. -->

    <issue id="ProtectedPermissions" severity="ignore" />



    <!-- Other recommended suppressions copied from go/fwlint. -->

    <issue id="Assert" severity="ignore" />

    <issue id="ClickableViewAccessibility" severity="ignore" />

    <issue id="GoogleAppIndexingWarning" severity="ignore" />

    <issue id="MissingPermission" severity="ignore" />

    <issue id="ParcelClassLoader" severity="ignore" />

    <issue id="ParcelCreator" severity="ignore" />

    <issue id="Registered" severity="ignore" />

    <issue id="RtlHardcoded" severity="ignore" />

    <issue id="ShiftFlags" severity="ignore" />

    <issue id="SuspiciousImport" severity="ignore" />



    <!-- Don't lint automatically translated strings. -->

    <issue id="all">

      <ignore path="res/values-*/strings.xml" />

    </issue>



    <!-- Don't warn about missing translations. -->

    <issue id="MissingTranslation">

      <ignore path="res/values/strings.xml" />

    </issue>

    

</lint>

packages/DocumentsUI/res/layout/fixed_layout.xml

+1 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 


            <include layout="@layout/directory_cluster"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:elevation="8dp" />



        </LinearLayout>

packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ public class DocumentsApplication extends Application { 


    @Override

    public void onCreate() {

        super.onCreate();



        final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);

        final int memoryClassBytes = am.getMemoryClass() * 1024 * 1024;

packages/DocumentsUI/src/com/android/documentsui/ListItem.java

+5 −9
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context; 
import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.TypedValue;

import android.view.View;

import android.widget.LinearLayout;



/**
@@ -39,14 +38,11 @@ public class ListItem extends LinearLayout 


    @Override

    protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {

        View indicator = findViewById(R.id.focus_indicator);

        if (gainFocus) {

        TypedValue color = new TypedValue();

            getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, color, true);

            indicator.setBackgroundColor(color.data);

        } else {

            indicator.setBackgroundColor(android.R.color.transparent);

        }

        int colorId = gainFocus ? android.R.attr.colorAccent : android.R.color.transparent;

        getContext().getTheme().resolveAttribute(colorId, color, true);



        findViewById(R.id.focus_indicator).setBackgroundColor(color.data);

        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);

    }

}

packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java

+6 −7
Original line number Diff line number Diff line
@@ -19,17 +19,12 @@ package com.android.documentsui; 
import static android.os.Environment.isStandardDirectory;

import static com.android.documentsui.Shared.DEBUG;



import java.io.File;

import java.io.IOException;

import java.util.List;



import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.ContentProvider;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.Context;
@@ -48,11 +43,15 @@ import android.provider.DocumentsContract; 
import android.text.TextUtils;

import android.util.Log;



import java.io.File;

import java.io.IOException;

import java.util.List;



/**

 * Activity responsible for handling {@link Intent#ACTION_OPEN_EXTERNAL_DOCUMENT}.

 */

public class OpenExternalDirectoryActivity extends Activity {

    private static final String TAG = "OpenExternalDirectoryActivity";

    private static final String TAG = "OpenExternalDirectory";

    private static final String FM_TAG = "open_external_directory";

    private static final String EXTERNAL_STORAGE_AUTH = "com.android.externalstorage.documents";

    private static final String EXTRA_FILE = "com.android.documentsui.FILE";
@@ -209,7 +208,7 @@ public class OpenExternalDirectoryActivity extends Activity { 
        return intent;

    }



    private static class OpenExternalDirectoryDialogFragment extends DialogFragment {

    public static class OpenExternalDirectoryDialogFragment extends DialogFragment {



        private File mFile;

        private String mVolumeLabel;