Use android:hint in TextInputLayout instead of TextInputEditText (should fix Meizu crashes) (b247e70d) · Commits · e / os / AccountManager

app/src/main/res/layout/login_account_details.xml

+9 −5

Original line number	Diff line number	Diff line
		@@ -40,13 +40,17 @@
		android:text="@string/login_create_account"
		android:layout_marginBottom="14dp"/>

		<EditText
		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_account_name">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_account_name"
		android:text="@={details.name}"
		app:error="@{details.nameError}"
		android:inputType="textEmailAddress"/>
		</com.google.android.material.textfield.TextInputLayout>

		<TextView
		android:id="@+id/account_email_hint"

app/src/main/res/layout/login_credentials_fragment.xml

+12 −12

Original line number	Diff line number	Diff line
		@@ -60,11 +60,11 @@

		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:hint="@string/login_email_address">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_email_address"
		android:text="@={model.username}"
		app:error="@{model.usernameError}"
		android:inputType="textEmailAddress"/>
		@@ -72,11 +72,11 @@
		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_password"
		app:passwordToggleEnabled="true">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_password"
		android:text="@={model.password}"
		app:error="@{model.passwordError}"
		android:fontFamily="monospace"
		@@ -102,22 +102,22 @@

		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:hint="@string/login_base_url">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_base_url"
		android:text="@={model.baseUrl}"
		app:error="@{model.baseUrlError}"
		android:inputType="textUri"/>
		</com.google.android.material.textfield.TextInputLayout>
		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:hint="@string/login_user_name">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_user_name"
		android:text="@={model.username}"
		app:error="@{model.usernameError}"
		android:inputType="textEmailAddress"/>
		@@ -125,15 +125,15 @@
		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		app:passwordToggleEnabled="true">
		app:passwordToggleEnabled="true"
		android:hint="@string/login_password">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:fontFamily="monospace"
		android:text="@={model.password}"
		app:error="@{model.passwordError}"
		android:inputType="textPassword"
		android:hint="@string/login_password"/>
		android:inputType="textPassword"/>
		</com.google.android.material.textfield.TextInputLayout>
		</LinearLayout>

		@@ -155,11 +155,11 @@

		<com.google.android.material.textfield.TextInputLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:hint="@string/login_base_url">
		<com.google.android.material.textfield.TextInputEditText
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:hint="@string/login_base_url"
		android:text="@={model.baseUrl}"
		app:error="@{model.baseUrlError}"
		android:inputType="textUri"/>