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

Commit 7aaceaa7 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

[lint] Fix Wrong Resource Type 

Bug: 285231003
Test: m Settings
Change-Id: I8dfbaf1342f014af35cd08906ac3f498b6c8c11a
parent 7d837a74

res/layout/wifi_api_test.xml→res/xml/wifi_api_test.xml

+0 −0

File moved.

View file

src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java

+3 −12
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ import android.content.Context; 
import android.os.Parcel;

import android.os.Parcelable;

import android.util.SparseIntArray;

import android.view.View;



import androidx.annotation.IdRes;

import androidx.annotation.DrawableRes;

import androidx.annotation.IntDef;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;
@@ -134,7 +133,8 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 


    public abstract CharSequence getSummary(Context context);



    @IdRes

    /** Gets the drawable resource id for the icon. */

    @DrawableRes

    public abstract int getIconId();



    /**
@@ -162,21 +162,12 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        preference.setTitle(getTitle(context));

        preference.setSummary(getSummary(context));

        preference.setIcon(getIconId());

        @IdRes int iconTintColorId = getIconTintColorId();

        if (iconTintColorId != View.NO_ID) {

            preference.getIcon().setTint(context.getColor(iconTintColorId));

        }

        final CardPreference cardPreference = castToCardPreferenceSafely(preference);

        if (cardPreference != null) {

            cardPreference.resetLayoutState();

        }

    }



    /** Returns the color resid for tinting {@link #getIconId()} or {@link View#NO_ID} if none. */

    public @IdRes int getIconTintColorId() {

        return View.NO_ID;

    }



    public boolean shouldShowDialog() {

        return mShowDialog;

    }

src/com/android/settings/wifi/WifiAPITest.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements 


    @Override

    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

        addPreferencesFromResource(R.layout.wifi_api_test);

        addPreferencesFromResource(R.xml.wifi_api_test);



        final PreferenceScreen preferenceScreen = getPreferenceScreen();

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.settings.fuelgauge.batterytip.tips; 
import static com.google.common.truth.Truth.assertThat;



import android.content.Context;

import android.view.View;

import android.os.Parcel;

import android.os.Parcelable;

import android.view.View;



import androidx.annotation.IdRes;

import androidx.annotation.DrawableRes;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;
@@ -45,7 +45,7 @@ public class BatteryTipTest { 


    private static final String TITLE = "title";

    private static final String SUMMARY = "summary";

    @IdRes

    @DrawableRes

    private static final int ICON_ID = R.drawable.ic_fingerprint;



    private Context mContext;