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

Commit a917e5b0 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Apply phrase based line breaking on most of Preference" into tm-qpr-dev am: e1ba912e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19415041



Change-Id: I40ce9620688ff5e7e71cfae389e3114fdc5f2527
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7e39d86 e1ba912e

packages/SettingsLib/ActionButtonsPreference/res/layout-v31/settingslib_action_buttons.xml

+4 −8
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>

        android:layout_weight="1"/>



    <View

        android:id="@+id/divider1"
@@ -44,8 +43,7 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>

        android:layout_weight="1"/>



    <View

        android:id="@+id/divider2"
@@ -60,8 +58,7 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>

        android:layout_weight="1"/>



    <View

        android:id="@+id/divider3"
@@ -76,6 +73,5 @@ 
        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:hyphenationFrequency="normalFast"/>

        android:layout_weight="1"/>

</LinearLayout>

packages/SettingsLib/ActionButtonsPreference/res/layout-v33/settingslib_action_buttons.xml

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

<!--

  Copyright (C) 2022 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:layout_margin="8dp"

    android:paddingHorizontal="8dp"

    android:orientation="horizontal">



    <Button

        android:id="@+id/button1"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:lineBreakWordStyle="phrase"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider1"

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:paddingHorizontal="4dp"

        android:visibility="gone"

        android:background="?android:colorBackground" />



    <Button

        android:id="@+id/button2"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:lineBreakWordStyle="phrase"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider2"

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:paddingHorizontal="4dp"

        android:visibility="gone"

        android:background="?android:colorBackground" />



    <Button

        android:id="@+id/button3"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:lineBreakWordStyle="phrase"

        android:hyphenationFrequency="normalFast"/>



    <View

        android:id="@+id/divider3"

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:paddingHorizontal="4dp"

        android:visibility="gone"

        android:background="?android:colorBackground" />



    <Button

        android:id="@+id/button4"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:lineBreakWordStyle="phrase"

        android:hyphenationFrequency="normalFast"/>

</LinearLayout>

packages/SettingsLib/AppPreference/res/layout-v33/preference_app.xml

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

<!--

  Copyright (C) 2022 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:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

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

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

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



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:minWidth="@dimen/secondary_app_icon_size"

        android:orientation="horizontal"

        android:paddingEnd="16dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/secondary_app_icon_size"

            android:layout_height="@dimen/secondary_app_icon_size"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:maxLines="2"

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

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



        <TextView

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textDirection="locale"

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

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

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



        <TextView

            android:id="@+id/appendix"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:maxLines="1"

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

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

            android:visibility="gone"/>



        <ProgressBar

            android:id="@android:id/progress"

            style="?android:attr/progressBarStyleHorizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="4dp"

            android:max="100"

            android:visibility="gone"/>

    </LinearLayout>



    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical|end"

        android:minWidth="@dimen/two_target_min_width"

        android:orientation="vertical"/>



</LinearLayout>

packages/SettingsLib/AppPreference/res/layout-v33/preference_app_header.xml

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

<!--

  Copyright (C) 2022 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:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

    android:paddingBottom="16dp"

    android:paddingTop="8dp"

    android:clickable="false">



    <TextView

        android:id="@+id/apps_top_intro_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textDirection="locale"

        android:clickable="false"

        android:longClickable="false"

        android:hyphenationFrequency="normalFast"

        android:lineBreakWordStyle="phrase"

        android:textAppearance="@style/TextAppearance.TopIntroText" />



</LinearLayout>

packages/SettingsLib/AppPreference/res/layout/preference_app.xml

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:maxLines="2"

            android:hyphenationFrequency="normalFast"

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



        <TextView
@@ -63,7 +62,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textDirection="locale"

            android:hyphenationFrequency="normalFast"

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

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