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

Commit da84e979 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing QsbBlockerView" into ub-launcher3-dorval-polish

parents c094a3ac 966d901a

res/layout-land/launcher.xml

+0 −6
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ 
            android:layout_height="@dimen/dynamic_grid_page_indicator_height"

            android:layout_gravity="bottom|left"/>



        <!-- A place holder view instead of the QSB in transposed layout -->

        <View

            android:layout_width="0dp"

            android:layout_height="10dp"

            android:id="@+id/workspace_blocked_row" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout-port/launcher.xml

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ 
            android:id="@+id/drop_target_bar"

            layout="@layout/drop_target_bar_horz" />



        <include

            layout="@layout/qsb_container"

            android:id="@+id/qsb_container" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout-sw720dp/launcher.xml

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ 
        <include layout="@layout/page_indicator"

                 android:id="@+id/page_indicator" />



        <include

            layout="@layout/qsb_container"

            android:id="@+id/qsb_container" />



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout/qsb_blocker_view.xml

deleted100644 → 0
+0 −20
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.

-->

<com.android.launcher3.qsb.QsbBlockerView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
 No newline at end of file

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ 
    <!-- View ID to use for QSB widget -->

    <item type="id" name="qsb_widget" />



    <!-- View ID to use for blocked area on the first screen -->

    <item type="id" name="workspace_blocked_row" />



    <!-- View ID used by cell layout to jail its content -->

    <item type="id" name="cell_layout_jail_id" />