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

Commit c1ec7723 authored by Lei Yu's avatar Lei Yu
Browse files

Remove the padding for VideoPreference 

In old days, VideoPreference has special padding in landscape and no
padding in protrait. This CL removes the padding dimen entirely.

Change-Id: Ic0ecd27cf7e200bd8fda58a37643482f146793a8
Fixes: 79543761
Test: Screenshot
parent 3a9fbac5

res/layout/gesture_preference.xml

deleted100644 → 0
+0 −104
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center_vertical"

    android:background="?android:attr/activatedBackgroundIndicator"

    android:clipToPadding="false"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="24dp"

        android:paddingBottom="16dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:background="@android:color/white">



        <TextView

            android:id="@android:id/title"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>



        <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:gravity="end|center_vertical"/>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/gesture_animation_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/gestures_setting_background_color"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:orientation="horizontal">



        <com.android.settings.widget.AspectRatioFrameLayout

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:padding="@dimen/gesture_animation_padding">



            <TextureView

                android:id="@+id/gesture_video"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_gravity="center"/>



            <ImageView

                android:id="@+id/gesture_image"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:scaleType="fitXY"

                android:background="@color/gestures_setting_background_color"/>



            <ImageView

                android:id="@+id/gesture_play_button"

                android:layout_width="@dimen/gestures_play_button_size"

                android:layout_height="@dimen/gestures_play_button_size"

                android:src="@drawable/ic_gesture_play_button"

                android:gravity="center"

                android:layout_gravity="center"/>



        </com.android.settings.widget.AspectRatioFrameLayout>



        <TextView

            android:id="@android:id/summary"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="@dimen/gestures_settings_padding_top_bottom"

            android:paddingStart="?android:attr/listPreferredItemPaddingStart"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:textColor="?android:attr/textColorSecondary"

            android:maxLines="10"

            android:ellipsize="end"/>



    </LinearLayout>



</LinearLayout>

res/layout/video_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
    <com.android.settings.widget.AspectRatioFrameLayout

        android:id="@+id/video_container"

        android:layout_width="wrap_content"

        android:layout_height="240dp"

        android:padding="@dimen/gesture_animation_padding">

        android:layout_height="240dp">



        <TextureView

            android:id="@+id/video_texture_view"

res/values-land/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -35,7 +35,4 @@ 
    <!-- Display, Screen zoom -->

    <dimen name="screen_zoom_preview_height">160dp</dimen>



    <!-- Gestures -->

    <dimen name="gesture_animation_padding">35dp</dimen>



</resources>

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ 
    <!-- Padding for Gestures settings screen -->

    <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>

    <dimen name="gestures_play_button_size">36dp</dimen>

    <dimen name="gesture_animation_padding">0dp</dimen>



    <dimen name="password_requirement_textsize">14sp</dimen>