Skip to content

Commit e1eddd7

Browse files
committed
1 parent 73d94e5 commit e1eddd7

3 files changed

Lines changed: 14 additions & 11 deletions

File tree

palace-ui/src/main/res/layout/account_list_item_old.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
android:layout_marginStart="16dp"
6161
android:src="@drawable/ic_delete"
6262
android:background="?attr/selectableItemBackgroundBorderless"
63-
android:contentDescription="@string/accountMore"
63+
android:contentDescription="@string/settingsAccessibilityAccountDelete"
6464
android:focusable="true"
6565
android:visibility="gone"
6666
tools:visibility="visible" />

palace-ui/src/main/res/layout/book_detail2.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@
176176
android:layout_width="match_parent"
177177
android:layout_height="match_parent"
178178
android:clickable="false"
179-
android:contentDescription="@string/catalogAccessibilityBackgroundImage"
180179
android:elevation="-10dp"
181-
android:focusable="false" />
180+
android:focusable="false"
181+
android:importantForAccessibility="no" />
182182

183183
<!-- The items that appear in the toolbar when the toolbar is "collapsed" -->
184184
<androidx.constraintlayout.widget.ConstraintLayout
@@ -260,8 +260,8 @@
260260
android:layout_height="24dp"
261261
android:layout_gravity="center"
262262
android:clickable="false"
263-
android:contentDescription="@string/catalogAccessibilityGoBack"
264263
android:focusable="false"
264+
android:importantForAccessibility="no"
265265
android:src="@drawable/arrow_left"
266266
android:tintMode="multiply"
267267
app:tint="#ffffffff" />
@@ -287,8 +287,10 @@
287287
android:layout_width="wrap_content"
288288
android:layout_height="@dimen/catalogBookDetailCoverHeight"
289289
android:background="@drawable/shadow_rect"
290-
android:contentDescription="@string/catalogBookCoverDescription"
290+
android:clickable="false"
291291
android:elevation="10dp"
292+
android:focusable="false"
293+
android:importantForAccessibility="no"
292294
android:scaleType="fitXY"
293295
app:layout_constraintEnd_toEndOf="parent"
294296
app:layout_constraintStart_toStartOf="parent"
@@ -337,16 +339,16 @@
337339
android:layout_width="0dp"
338340
android:layout_height="wrap_content"
339341
android:layout_marginEnd="8dp"
340-
android:maxLines="1"
341-
android:text="@string/catalogDownload"
342342
android:autoSizeMaxTextSize="16sp"
343343
android:autoSizeTextType="uniform"
344-
app:layout_constraintWidth_max="160dp"
344+
android:maxLines="1"
345+
android:text="@string/catalogDownload"
345346
app:layout_constraintEnd_toStartOf="@id/book2DOverlayButton1"
346347
app:layout_constraintHorizontal_chainStyle="packed"
347348
app:layout_constraintHorizontal_weight="1"
348349
app:layout_constraintStart_toStartOf="parent"
349350
app:layout_constraintTop_toTopOf="parent"
351+
app:layout_constraintWidth_max="160dp"
350352
app:layout_goneMarginEnd="0dp" />
351353

352354
<Button
@@ -355,15 +357,15 @@
355357
android:layout_width="0dp"
356358
android:layout_height="wrap_content"
357359
android:layout_marginStart="8dp"
358-
android:maxLines="1"
359-
android:text="@string/catalogPreview"
360360
android:autoSizeMaxTextSize="16sp"
361361
android:autoSizeTextType="uniform"
362-
app:layout_constraintWidth_max="160dp"
362+
android:maxLines="1"
363+
android:text="@string/catalogPreview"
363364
app:layout_constraintEnd_toEndOf="parent"
364365
app:layout_constraintHorizontal_weight="1"
365366
app:layout_constraintStart_toEndOf="@id/book2DOverlayButton0"
366367
app:layout_constraintTop_toTopOf="parent"
368+
app:layout_constraintWidth_max="160dp"
367369
app:layout_goneMarginStart="0dp" />
368370
</androidx.constraintlayout.widget.ConstraintLayout>
369371

palace-ui/src/main/res/values/stringsSettings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,5 @@
8787
<string name="settingsNetworkWIFIOnlyEnabled">When enabled, books and audiobooks will only download over Wi-Fi. Downloads will be blocked on cellular data.</string>
8888
<string name="settingsAccessibilitySearchButton">Library Search Button</string>
8989
<string name="settingsAccessibilitySearchButtonClose">Close Search Button</string>
90+
<string name="settingsAccessibilityAccountDelete">Delete Account Button</string>
9091
</resources>

0 commit comments

Comments
 (0)