For #12106: Follow ux mock on Settings --> Logins screen
parent
4624bf5c50
commit
ca30fef579
|
@ -1,11 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -15,34 +12,41 @@
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:minHeight="?android:attr/listPreferredItemHeight">
|
android:minHeight="?android:attr/listPreferredItemHeight">
|
||||||
|
|
||||||
<ImageView
|
<FrameLayout
|
||||||
android:id="@+id/favicon_image"
|
android:id="@+id/favicon_wrapper"
|
||||||
android:layout_width="24dp"
|
android:layout_width="40dp"
|
||||||
android:layout_height="24dp"
|
android:layout_height="40dp"
|
||||||
|
android:padding="4dp"
|
||||||
android:layout_marginStart="16dp"
|
android:layout_marginStart="16dp"
|
||||||
android:adjustViewBounds="true"
|
android:background="@drawable/top_sites_background"
|
||||||
android:importantForAccessibility="no"
|
android:layout_gravity="center"
|
||||||
android:scaleType="fitCenter"
|
android:importantForAccessibility="noHideDescendants"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintDimensionRatio="1:1"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/favicon_image"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:importantForAccessibility="no"
|
||||||
|
android:scaleType="fitCenter" />
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/webAddressView"
|
android:id="@+id/webAddressView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="12dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_weight="1"
|
android:layout_marginEnd="48dp"
|
||||||
android:ellipsize="middle"
|
android:ellipsize="middle"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||||
android:textColor="?primaryText"
|
android:textColor="?primaryText"
|
||||||
app:layout_constraintBottom_toTopOf="@id/usernameView"
|
app:layout_constraintBottom_toTopOf="@id/usernameView"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/favicon_image"
|
app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="mozilla.org" />
|
tools:text="mozilla.org" />
|
||||||
|
@ -51,16 +55,14 @@
|
||||||
android:id="@+id/usernameView"
|
android:id="@+id/usernameView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="12dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_weight="1"
|
android:layout_marginEnd="48dp"
|
||||||
android:ellipsize="middle"
|
android:ellipsize="middle"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="?secondaryText"
|
android:textColor="?secondaryText"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/favicon_image"
|
app:layout_constraintStart_toEndOf="@+id/favicon_wrapper"
|
||||||
app:layout_constraintTop_toBottomOf="@id/webAddressView"
|
app:layout_constraintTop_toBottomOf="@id/webAddressView"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
tools:text="mozilla.org" />
|
tools:text="mozilla.org" />
|
||||||
|
|
|
@ -2,25 +2,20 @@
|
||||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
<Preference
|
||||||
<androidx.preference.Preference
|
|
||||||
app:iconSpaceReserved="false"
|
|
||||||
android:key="@string/pref_key_save_logins_settings"
|
android:key="@string/pref_key_save_logins_settings"
|
||||||
android:summary="@string/preferences_passwords_save_logins_ask_to_save"
|
android:summary="@string/preferences_passwords_save_logins_ask_to_save"
|
||||||
android:title="@string/preferences_passwords_save_logins" />
|
android:title="@string/preferences_passwords_save_logins" />
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
app:iconSpaceReserved="false"
|
|
||||||
android:defaultValue="true"
|
android:defaultValue="true"
|
||||||
android:key="@string/pref_key_autofill_logins"
|
android:key="@string/pref_key_autofill_logins"
|
||||||
android:title="@string/preferences_passwords_autofill" />
|
android:title="@string/preferences_passwords_autofill" />
|
||||||
<androidx.preference.Preference
|
<Preference
|
||||||
app:iconSpaceReserved="false"
|
|
||||||
android:key="@string/pref_key_password_sync_logins"
|
android:key="@string/pref_key_password_sync_logins"
|
||||||
android:summary="@string/preferences_passwords_sync_logins_off"
|
android:summary="@string/preferences_passwords_sync_logins_off"
|
||||||
android:title="@string/preferences_passwords_sync_logins" />
|
android:title="@string/preferences_passwords_sync_logins" />
|
||||||
<androidx.preference.Preference
|
<Preference
|
||||||
app:iconSpaceReserved="false"
|
|
||||||
android:key="@string/pref_key_saved_logins"
|
android:key="@string/pref_key_saved_logins"
|
||||||
android:title="@string/preferences_passwords_saved_logins" />
|
android:title="@string/preferences_passwords_saved_logins" />
|
||||||
</androidx.preference.PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
|
Loading…
Reference in New Issue