Remove the useless parts in the 'add word' dialog. (ac499c34) · Commits · e / os / android_packages_apps_Settings

res/layout/user_dictionary_add_word.xml

+12 −77

Original line number	Diff line number	Diff line
		@@ -37,22 +37,10 @@
		android:background="@android:color/holo_blue_light" />
		</LinearLayout>

		<GridLayout android:id="@+id/user_dictionary_add_word_grid"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="8dip"
		android:layout_marginRight="8dip"
		android:columnCount="2">
		<TextView android:id="@+id/user_dictionary_add_word_label"
		style="?android:attr/textAppearanceSmall"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="left\|center_vertical"
		android:text="@string/user_dict_settings_add_word_option_name"
		android:visibility="gone" />
		<EditText android:id="@+id/user_dictionary_add_word_text"
		android:maxLength="@integer/maximum_user_dictionary_word_length"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		android:layout_gravity="fill_horizontal\|center_vertical"
		android:layout_marginLeft="8dip"
		android:layout_marginBottom="8dip"
		@@ -61,38 +49,6 @@
		android:imeOptions="flagNoFullscreen">
		<requestFocus />
		</EditText>
		<TextView android:id="@+id/user_dictionary_add_shortcut_label"
		style="?android:attr/textAppearanceSmall"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="left\|center_vertical"
		android:text="@string/user_dict_settings_add_shortcut_option_name"
		android:visibility="gone" />
		<EditText android:id="@+id/user_dictionary_settings_add_dialog_shortcut"
		android:maxLength="@integer/maximum_user_dictionary_word_length"
		android:layout_width="wrap_content"
		android:layout_gravity="fill_horizontal\|center_vertical"
		android:layout_marginLeft="8dip"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="8dip"
		android:inputType="textNoSuggestions"
		android:imeOptions="flagNoFullscreen"
		android:visibility="gone" />
		<TextView android:id="@+id/user_dictionary_add_locale_label"
		style="?android:attr/textAppearanceSmall"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="left\|center_vertical"
		android:text="@string/user_dict_settings_add_locale_option_name"
		android:visibility="gone" />
		<Spinner android:id="@+id/user_dictionary_settings_add_dialog_locale"
		android:layout_marginLeft="8dip"
		android:layout_marginBottom="8dip"
		android:layout_marginTop="8dip"
		android:layout_width="wrap_content"
		android:layout_gravity="fill_horizontal\|center_vertical"
		android:visibility="gone" />
		</GridLayout>

		<LinearLayout android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -114,27 +70,6 @@
		android:text="@string/cancel"
		android:layout_height="wrap_content"
		android:onClick="onClickCancel" />
		<Button android:id="@+id/user_dictionary_settings_add_dialog_more_options"
		android:layout_width="0dip"
		android:layout_gravity="center_horizontal"
		android:layout_weight="1"
		android:maxLines="2"
		style="?android:attr/buttonBarButtonStyle"
		android:textSize="14sp"
		android:text="@string/user_dict_settings_add_dialog_more_options"
		android:layout_height="wrap_content"
		android:onClick="onClickMoreOptions" />
		<Button android:id="@+id/user_dictionary_settings_add_dialog_less_options"
		android:layout_width="0dip"
		android:layout_gravity="center_horizontal"
		android:layout_weight="1"
		android:maxLines="2"
		style="?android:attr/buttonBarButtonStyle"
		android:textSize="14sp"
		android:text="@string/user_dict_settings_add_dialog_less_options"
		android:layout_height="wrap_content"
		android:visibility="gone"
		android:onClick="onClickLessOptions" />
		<Button android:layout_width="0dip"
		android:layout_gravity="right"
		android:layout_weight="1"

src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java

+0 −50

Original line number	Diff line number	Diff line
		@@ -41,18 +41,8 @@ public class UserDictionaryAddWordActivity extends Activity {
		public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
		public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";

		private static final int[] IDS_SHOWN_ONLY_IN_MORE_OPTIONS_MODE = {
		R.id.user_dictionary_add_word_label,
		R.id.user_dictionary_add_shortcut_label,
		R.id.user_dictionary_add_locale_label,
		R.id.user_dictionary_settings_add_dialog_shortcut,
		R.id.user_dictionary_settings_add_dialog_locale,
		};

		private UserDictionaryAddWordContents mContents;

		private boolean mIsShowingMoreOptions = false;

		@Override
		public void onCreate(final Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		@@ -76,30 +66,15 @@ public class UserDictionaryAddWordActivity extends Activity {
		args.putInt(UserDictionaryAddWordContents.EXTRA_MODE, mode);

		if (null != savedInstanceState) {
		mIsShowingMoreOptions =
		savedInstanceState.getBoolean(STATE_KEY_IS_OPEN, mIsShowingMoreOptions);
		// Override options if we have a saved state.
		args.putAll(savedInstanceState);
		}

		mContents = new UserDictionaryAddWordContents(getWindow().getDecorView(), args);

		if (mIsShowingMoreOptions) {
		onClickMoreOptions(findViewById(R.id.user_dictionary_settings_add_dialog_more_options));
		}

		// TODO: The following code enables layout transition for eye-candy, but there is still
		// a jankiness issue with the window moving on one frame, resizing suddenly on the next,
		// and animation only starting afterwards on children.
		final ViewGroup v = (ViewGroup)findViewById(R.id.user_dictionary_add_word_grid);
		final LayoutTransition transition = new LayoutTransition();
		transition.setStartDelay(LayoutTransition.APPEARING, 0);
		v.setLayoutTransition(transition);
		}

		@Override
		public void onSaveInstanceState(final Bundle outState) {
		outState.putBoolean(STATE_KEY_IS_OPEN, mIsShowingMoreOptions);
		outState.putString(
		UserDictionaryAddWordContents.EXTRA_WORD, mContents.mEditText.getText().toString());
		outState.putString(UserDictionaryAddWordContents.EXTRA_LOCALE, mContents.mLocale);
		@@ -113,29 +88,4 @@ public class UserDictionaryAddWordActivity extends Activity {
		mContents.apply(this);
		finish();
		}

		public void onClickMoreOptions(final View v) {
		for (final int idToShow : IDS_SHOWN_ONLY_IN_MORE_OPTIONS_MODE) {
		final View viewToShow = findViewById(idToShow);
		viewToShow.setVisibility(View.VISIBLE);
		}
		findViewById(R.id.user_dictionary_settings_add_dialog_more_options)
		.setVisibility(View.GONE);
		findViewById(R.id.user_dictionary_settings_add_dialog_less_options)
		.setVisibility(View.VISIBLE);

		mIsShowingMoreOptions = true;
		}

		public void onClickLessOptions(final View v) {
		for (final int idToHide : IDS_SHOWN_ONLY_IN_MORE_OPTIONS_MODE) {
		final View viewToHide = findViewById(idToHide);
		viewToHide.setVisibility(View.GONE);
		}
		findViewById(R.id.user_dictionary_settings_add_dialog_more_options)
		.setVisibility(View.VISIBLE);
		findViewById(R.id.user_dictionary_settings_add_dialog_less_options)
		.setVisibility(View.GONE);
		mIsShowingMoreOptions = false;
		}
		}