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

Commit 69a49c1d authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

merged ub-launcher3-dorval, and resolved conflicts 

Test: $ make -j 32 dist checkbuild
Bug: 62196967

Change-Id: Ibdcdde25cb117574549404348105d49348e79bea
parents 93d0b871 8b6ea60f

proguard.flags

+4 −0
Original line number Diff line number Diff line
@@ -94,3 +94,7 @@ 
-keep interface com.android.launcher3.userevent.nano.LauncherLogProto.** {

  *;

}



-keep interface com.android.launcher3.model.nano.LauncherDumpProto.** {

  *;

}

protos/launcher_log.proto

+1 −0
Original line number Diff line number Diff line
@@ -156,4 +156,5 @@ message LauncherEvent { 
  optional int64 elapsed_session_millis = 6;



  optional bool is_in_multi_window_mode = 7;

  optional bool is_in_landscape_mode = 8;

}

res/layout/all_apps_discovery_item.xml

+6 −3
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
        android:layout_width="56dp"

        android:layout_height="56dp"

        android:padding="8dp"

        android:scaleType="fitCenter"/>

        android:scaleType="fitCenter"

        android:focusable="false"

        android:importantForAccessibility="no"/>



    <LinearLayout

        android:layout_width="match_parent"
@@ -51,11 +53,12 @@ 
                android:layout_height="wrap_content"

                android:textColor="?android:textColorSecondary"

                android:textSize="14sp"

                android:layout_gravity="center_vertical"/>

                android:layout_gravity="center_vertical"

                android:includeFontPadding="false"/>



            <com.android.launcher3.discovery.RatingView

                android:id="@+id/rating_view"

                android:layout_width="80dp"

                android:layout_width="70dp"

                android:layout_height="16dp"

                android:layout_marginLeft="5dp"

                android:layout_marginRight="5dp"

res/layout/all_apps_discovery_loading_divider.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

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

    android:layout_width="match_parent"

    android:layout_height="20dp"

    android:layout_height="6dp"

    android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

    android:paddingRight="@dimen/container_fastscroll_thumb_max_width">
@@ -34,7 +34,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="@drawable/all_apps_divider"

        android:layout_gravity="center"

        android:layout_gravity="bottom"

        android:visibility="invisible"/>



</FrameLayout>
 
 No newline at end of file

res/layout/deep_shortcut.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ 
        android:background="?android:attr/selectableItemBackground"

        android:gravity="start|center_vertical"

        android:textAlignment="viewStart"

        android:paddingStart="@dimen/bg_popup_item_height"

        android:paddingStart="@dimen/deep_shortcuts_text_padding_start"

        android:paddingEnd="@dimen/popup_padding_end"

        android:drawableEnd="@drawable/deep_shortcuts_drag_handle"

        android:drawablePadding="@dimen/deep_shortcut_drawable_padding"

        android:textSize="14sp"

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

        android:fontFamily="sans-serif"

        launcher:layoutHorizontal="true"

        launcher:iconDisplay="shortcut_popup"