Merge "Move the content description for Display size and text preview to xml" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
a9ef330701
@@ -46,7 +46,6 @@
|
||||
android:id="@+id/preview_pager"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="217dp"
|
||||
android:contentDescription="@string/preview_pager_content_description"
|
||||
android:nestedScrollingEnabled="true" />
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@@ -14,14 +14,19 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<com.android.settings.display.AppGridView
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:numColumns="3"
|
||||
android:gravity="center"
|
||||
android:nestedScrollingEnabled="true"
|
||||
android:importantForAccessibility="noHideDescendants"
|
||||
app:appCount="6"/>
|
||||
android:contentDescription="@string/preview_pager_home_content_description" >
|
||||
<com.android.settings.display.AppGridView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:numColumns="3"
|
||||
android:gravity="center"
|
||||
android:nestedScrollingEnabled="true"
|
||||
android:importantForAccessibility="noHideDescendants"
|
||||
app:appCount="6"/>
|
||||
</FrameLayout>
|
||||
|
@@ -14,18 +14,18 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:importantForAccessibility="noHideDescendants">
|
||||
android:contentDescription="@string/preview_pager_email_content_description">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
android:importantForAccessibility="noHideDescendants">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subject"
|
||||
|
@@ -19,12 +19,13 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true"
|
||||
android:importantForAccessibility="noHideDescendants">
|
||||
android:contentDescription="@string/preview_pager_message_content_description">
|
||||
|
||||
<view class="com.android.settings.TouchBlockingFrameLayout"
|
||||
android:id="@+id/frame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:importantForAccessibility="noHideDescendants">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
Reference in New Issue
Block a user