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

Commit c0ff1c1f authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge changes I49f4b5d6,I8eb5047d 

* changes:
  Add accessibility annotations to dream settings.
  Update dream settings strings to match latest UX mocks
parents eef858a4 9b302658

res/layout/dream_preference_layout.xml

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
            android:layout_width="0dp"

            android:layout_height="0dp"

            android:background="@drawable/dream_preview_rounded_bg"

            android:importantForAccessibility="no"

            app:layout_constraintDimensionRatio="1:1"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +45,7 @@ 
            android:layout_width="@dimen/dream_preview_placeholder_width"

            android:layout_height="0dp"

            android:src="@drawable/dream_default_preview_icon"

            android:importantForAccessibility="no"

            app:layout_constraintDimensionRatio="1:1"

            app:layout_constraintTop_toTopOf="@+id/preview"

            app:layout_constraintBottom_toBottomOf="@+id/preview"
@@ -70,6 +72,7 @@ 
            android:layout_marginStart="@dimen/dream_item_icon_margin_start"

            android:layout_marginBottom="@dimen/dream_item_title_margin_bottom"

            android:gravity="center_vertical"

            android:importantForAccessibility="no"

            app:layout_constraintDimensionRatio="1:1"

            app:layout_constraintHorizontal_chainStyle="packed"

            app:layout_constraintTop_toBottomOf="@+id/preview"

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -13907,13 +13907,13 @@ 
    <!-- TARE dialog button to proceed with a value change [CHAR LIMIT=none] -->

    <string name="tare_dialog_confirm_button_title">Confirm</string>

    <!-- Button to preview the selected screensaver in settings [CHAR LIMIT=40] -->

    <string name="dream_preview_button_title">Preview screen saver</string>

    <string name="dream_preview_button_title">Preview</string>

    <!-- The title of the category to show for the screensaver selector in settings [CHAR LIMIT=none] -->

    <string name="dream_picker_category">Choose a background</string>

    <string name="dream_picker_category">Choose a screen saver</string>

    <!-- The title of the toggle which enables/disables overlays on top of the screen saver [CHAR LIMIT=none] -->

    <string name="dream_complications_toggle_title">Show additional information</string>

    <!-- The summary of what overlays this toggle controls [CHAR LIMIT=none] -->

    <string name="dream_complications_toggle_summary">Display data time, date and weather on the screen saver</string>

    <string name="dream_complications_toggle_summary">Display time, date and weather on the screen saver</string>

    <!-- The title of the category to show for the screensaver miscellaneous settings [CHAR LIMIT=none] -->

    <string name="dream_more_settings_category">More settings</string>

    <!-- The title of the screen saver setup page [CHAR LIMIT=none] -->