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

Commit 507e5f8c authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix some errors for Settings project 

Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.

Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.

Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
parent 15066fe3

res/values/attrs.xml

+8 −11
Original line number Diff line number Diff line
@@ -93,10 +93,14 @@ 
        <attr name="currentPageIndicatorColor" format="color" />

    </declare-styleable>



    <declare-styleable name="MessageView">

        <attr name="messageText" format="reference" />

    </declare-styleable>



    <!-- For ConversationMessageView -->

    <declare-styleable name="ConversationMessageView">

    <declare-styleable name="ConversationMessageView" parent="MessageView">

        <attr name="incoming" format="boolean" />

        <attr name="messageText" format="reference" />

        <attr name="messageText" />

        <attr name="timestampText" format="reference" />

        <attr name="iconText" format="reference" />

        <attr name="iconTextColor" format="reference|color" />
@@ -146,16 +150,9 @@ 
        <attr name="android:gravity" />

    </declare-styleable>



    <!-- For biometric enroll checkboxes -->

    <declare-styleable name="BiometricEnrollCheckbox">

        <attr name="icon" format="reference" />

        <attr name="title" format="reference" />

        <attr name="description" format="reference" />

    </declare-styleable>



    <!-- For Face enroll accessibility toggle -->

    <declare-styleable name="FaceEnrollAccessibilityToggle">

        <attr name="messageText" format="reference" />

    <declare-styleable name="FaceEnrollAccessibilityToggle" parent="MessageView">

        <attr name="messageText" />

    </declare-styleable>



    <!-- For TwoStatesButtonPreference -->

src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.intentpicker.AppLaunchSettings;

import com.android.settings.applications.intentpicker.IntentPickerUtils;

import com.android.settingslib.R;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;

src/com/android/settings/bluetooth/QrCodeScanModeActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.util.Log; 


import androidx.fragment.app.FragmentTransaction;



import com.android.settingslib.R;

import com.android.settings.R;

import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;

import com.android.settingslib.bluetooth.BluetoothUtils;

src/com/android/settings/bluetooth/QrCodeScanModeBaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.SystemProperties; 


import androidx.fragment.app.FragmentManager;



import com.android.settingslib.R;

import com.android.settings.R;

import com.android.settingslib.core.lifecycle.ObservableActivity;



import com.google.android.setupdesign.util.ThemeHelper;

src/com/android/settings/bluetooth/QrCodeScanModeFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import android.widget.TextView; 
import androidx.annotation.NonNull;

import androidx.annotation.StringRes;



import com.android.settings.R;

import com.android.settings.core.InstrumentedFragment;

import com.android.settingslib.R;

import com.android.settingslib.bluetooth.BluetoothBroadcastUtils;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.qrcode.QrCamera;