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

Commit 01f35ce4 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Use DimmableIconPreference for Add user action" into mnc-dev

parents 2defc457 a7a7bfe5

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5425,6 +5425,8 @@ 
    <string name="user_nickname">Nickname</string>

    <!-- Title for add user type dialog [CHAR LIMIT=45] -->

    <string name="user_add_user_type_title">Add</string>

    <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->

    <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string>

    <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->

    <string name="user_add_user_item_summary">Users have their own apps and content</string>

    <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->

res/xml/user_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
            android:title="@string/user_list_title">

    </PreferenceCategory>



    <Preference

    <com.android.settings.DimmableIconPreference

            android:key="user_add"

            android:title="@string/user_add_user_or_profile_menu"

            android:icon="@drawable/ic_menu_add_dark" />

src/com/android/settings/location/DimmableIconPreference.java→src/com/android/settings/DimmableIconPreference.java

+3 −10
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.location;

package com.android.settings;



import android.annotation.Nullable;

import android.content.Context;
@@ -35,16 +35,9 @@ public class DimmableIconPreference extends Preference { 


    private final CharSequence mContentDescription;



    public DimmableIconPreference(Context context, AttributeSet attrs, int defStyle,

            @Nullable CharSequence contentDescription) {

        super(context, attrs, defStyle);

        mContentDescription = contentDescription;

    }



    public DimmableIconPreference(Context context, AttributeSet attrs,

            @Nullable CharSequence contentDescription) {

    public DimmableIconPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

        mContentDescription = contentDescription;

        mContentDescription = null;

    }



    public DimmableIconPreference(Context context, @Nullable CharSequence contentDescription) {

src/com/android/settings/location/RecentLocationApps.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.preference.Preference;

import android.util.Log;



import com.android.settings.DimmableIconPreference;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.applications.InstalledAppDetails;

src/com/android/settings/location/SettingsInjector.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ import android.util.AttributeSet; 
import android.util.Log;

import android.util.Xml;



import com.android.settings.DimmableIconPreference;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;