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

Commit cc7f74a6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Enforce non-blank profile names"

parents b0f8203d 342f91f4

res/layout/profile_name_dialog.xml

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

        android:id="@+id/name"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:hint="@string/rename_dialog_hint"

        android:singleLine="true"

        android:singleLine="true"

        android:textAppearance="?android:attr/textAppearanceMedium" />

        android:textAppearance="?android:attr/textAppearanceMedium" />

res/values/cm_strings.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <string name="rename_dialog_message">Enter a new name</string>

    <string name="rename_dialog_message">Enter a new name</string>

    <string name="duplicate_profile_name">Duplicate profile name!</string>

    <string name="duplicate_profile_name">Duplicate profile name!</string>

    <string name="duplicate_appgroup_name">Duplicate app group name!</string>

    <string name="duplicate_appgroup_name">Duplicate app group name!</string>

    <string name="rename_dialog_hint">Enter profile name</string>





    <!-- Reset Profiles -->

    <!-- Reset Profiles -->

    <string name="profile_reset_title">Reset</string>

    <string name="profile_reset_title">Reset</string>

src/com/android/settings/profiles/SetupActionsFragment.java

+26 −2
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ import android.media.RingtoneManager; 
import android.net.wimax.WimaxHelper;

import android.net.wimax.WimaxHelper;

import android.os.Bundle;

import android.os.Bundle;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.text.Editable;

import android.text.TextUtils;

import android.text.TextWatcher;

import android.util.Log;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.Menu;
@@ -41,6 +44,7 @@ import android.view.MenuItem; 
import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.AdapterView;

import android.widget.Button;

import android.widget.CheckBox;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.CompoundButton;

import android.widget.EditText;

import android.widget.EditText;
@@ -507,7 +511,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
        final EditText entry = (EditText) dialogView.findViewById(R.id.name);

        final EditText entry = (EditText) dialogView.findViewById(R.id.name);

        entry.setText(mProfile.getName());

        entry.setText(mProfile.getName());





        new AlertDialog.Builder(getActivity())

        final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())

                .setTitle(R.string.rename_dialog_title)

                .setTitle(R.string.rename_dialog_title)

                .setView(dialogView)

                .setView(dialogView)

                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@@ -520,7 +524,27 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
                    }

                    }

                })

                })

                .setNegativeButton(android.R.string.cancel, null)

                .setNegativeButton(android.R.string.cancel, null)

                .show();

                .create();



        entry.addTextChangedListener(new TextWatcher() {

            @Override

            public void beforeTextChanged(CharSequence s, int start, int count, int after) {



            }



            @Override

            public void onTextChanged(CharSequence s, int start, int before, int count) {



            }



            @Override

            public void afterTextChanged(Editable s) {

                final boolean empty = TextUtils.isEmpty(s.toString());

                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(!empty);

            }

        });



        alertDialog.show();

    }

    }





    @Override

    @Override