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

Commit 470e87db authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9050009 from 69b9e736 to tm-qpr1-release

Change-Id: I695e33602c1ad09edb6ebeeb32e1e73c749b52cf
parents 518a7b15 69b9e736
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@
    android:layout_width="match_parent"
    android:layout_height="@dimen/all_apps_header_pill_height"
    android:layout_gravity="center_horizontal"
    android:paddingTop="@dimen/all_apps_tabs_vertical_padding"
    android:paddingBottom="@dimen/all_apps_tabs_vertical_padding"
    android:orientation="horizontal"
    style="@style/TextHeadline">

@@ -28,7 +30,6 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_marginEnd="@dimen/all_apps_tabs_button_horizontal_padding"
        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"
        android:layout_weight="1"
        android:background="@drawable/all_apps_tabs_background"
        android:text="@string/all_apps_personal_tab"
@@ -41,7 +42,6 @@
        android:layout_width="0dp"
        android:layout_height="match_parent"
        android:layout_marginStart="@dimen/all_apps_tabs_button_horizontal_padding"
        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"
        android:layout_weight="1"
        android:background="@drawable/all_apps_tabs_background"
        android:text="@string/all_apps_work_tab"
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/search_results_list_view"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_height="match_parent"
    android:clipToPadding="false"
    android:descendantFocusability="afterDescendants"
    android:focusable="true" />
+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@
    android:textColor="@color/all_apps_tab_text"
    android:textSize="14sp"
    android:background="@drawable/work_apps_toggle_background"
    android:forceHasOverlappingRendering="false"
    android:drawablePadding="8dp"
    android:drawableStart="@drawable/ic_corp_off"
    android:layout_marginBottom="@dimen/work_fab_margin_bottom"
+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@
package com.android.launcher3;

import static com.android.launcher3.logging.KeyboardStateManager.KeyboardState.SHOW;
import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;

import android.content.Context;
import android.text.TextUtils;
@@ -90,7 +89,7 @@ public class ExtendedEditText extends EditText {
    }

    public void hideKeyboard() {
        hideKeyboardAsync(ActivityContext.lookupContext(getContext()), getWindowToken());
        ActivityContext.lookupContext(getContext()).hideKeyboard();
        clearFocus();
    }

+0 −11
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ import com.android.launcher3.util.Themes;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.TouchController;
import com.android.launcher3.util.TraceHelper;
import com.android.launcher3.util.UiThreadHelper;
import com.android.launcher3.util.ViewOnDrawExecutor;
import com.android.launcher3.views.ActivityContext;
import com.android.launcher3.views.FloatingIconView;
@@ -1653,16 +1652,6 @@ public class Launcher extends StatefulActivity<LauncherState>
        }
    }

    /**
     * Hides the keyboard if visible
     */
    public void hideKeyboard() {
        final View v = getWindow().peekDecorView();
        if (v != null && v.getWindowToken() != null) {
            UiThreadHelper.hideKeyboardAsync(this, v.getWindowToken());
        }
    }

    @Override
    public void onRestoreInstanceState(Bundle state) {
        super.onRestoreInstanceState(state);
Loading