resolve merge conflicts of 3826bab27e to ub-launcher3-calgary. (7c50b31f) · Commits · e / os / android_packages_apps_Trebuchet

res/drawable/all_apps_search_bg.xml

+22 −4

Original line number	Diff line number	Diff line
		@@ -14,7 +14,25 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<inset xmlns:android="http://schemas.android.com/apk/res/android"
		android:drawable="@drawable/quantum_panel"
		android:insetTop="@dimen/container_bounds_minus_quantum_panel_padding_inset"
		android:insetBottom="@dimen/container_bounds_minus_quantum_panel_padding_inset" />
		No newline at end of file
		<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
		<item>
		<shape android:shape="rectangle">
		<solid android:color="@color/quantum_panel_bg_color" />
		<corners
		android:topLeftRadius="2dp"
		android:topRightRadius="2dp" />
		</shape>
		</item>
		<item
		android:top="@dimen/all_apps_search_bar_bg_overflow"
		android:left="@dimen/all_apps_search_bar_bg_overflow"
		android:right="@dimen/all_apps_search_bar_bg_overflow"
		android:bottom="0dp">

		<shape android:shape="rectangle">
		<stroke
		android:width="@dimen/all_apps_search_bar_divider_width"
		android:color="#1E000000"/>
		</shape>
		</item>
		</layer-list>
		No newline at end of file

res/layout-land/launcher.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@

		<com.android.launcher3.dragndrop.DragLayer
		android:id="@+id/drag_layer"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

res/layout-port/launcher.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@

		<com.android.launcher3.dragndrop.DragLayer
		android:id="@+id/drag_layer"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

res/layout-sw720dp/launcher.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@

		<com.android.launcher3.dragndrop.DragLayer
		android:id="@+id/drag_layer"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

res/layout/all_apps.xml

+57 −25

Original line number	Diff line number	Diff line
		@@ -18,40 +18,72 @@
		will bake the left/right padding into that view's background itself. -->
		<com.android.launcher3.allapps.AllAppsContainerView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:id="@+id/apps_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		android:orientation="vertical"
		launcher:revealBackground="@drawable/quantum_panel_shape">

		<!-- Both android:focusable and android:focusableInTouchMode are needed for
		the view to get focus change events. -->
		<FrameLayout
		android:id="@+id/search_box_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:focusable="true"
		android:focusableInTouchMode="true"
		android:visibility="gone" />

		<FrameLayout
		android:id="@+id/content"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1">
		<FrameLayout
		android:id="@+id/all_apps_reveal"
		<View
		android:id="@+id/reveal_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:focusable="false"
		android:elevation="2dp"
		android:visibility="invisible" />
		<include
		layout="@layout/all_apps_container"
		android:id="@+id/all_apps_container"


		<com.android.launcher3.allapps.AllAppsRecyclerViewContainerView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/main_content"
		android:visibility="gone"
		android:layout_gravity="center"
		android:visibility="gone" />
		</FrameLayout>
		android:focusable="true"
		android:focusableInTouchMode="true"
		android:elevation="15dp" >

		<!-- DO NOT CHANGE THE ID -->
		<com.android.launcher3.allapps.AllAppsRecyclerView
		android:id="@+id/apps_list_view"
		android:theme="@style/Theme.Light.CustomOverscroll"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_horizontal\|top"
		android:clipToPadding="false"
		android:focusable="true"
		android:layout_marginTop="@dimen/all_apps_search_bar_height"
		android:descendantFocusability="afterDescendants" />

		<LinearLayout
		android:id="@+id/search_container"
		android:layout_width="match_parent"
		android:layout_height="@dimen/all_apps_search_bar_height"
		android:layout_gravity="start\|top"
		android:orientation="horizontal"
		android:background="@drawable/all_apps_search_bg" >

		<com.android.launcher3.ExtendedEditText
		android:id="@+id/search_box_input"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@android:color/transparent"
		android:focusableInTouchMode="true"
		android:gravity="fill_horizontal\|center_vertical"
		android:hint="@string/all_apps_search_bar_hint"
		android:inputType="text\|textNoSuggestions\|textCapWords"
		android:imeOptions="actionSearch\|flagNoExtractUi"
		android:maxLines="1"
		android:scrollHorizontally="true"
		android:layout_marginLeft="@dimen/container_fastscroll_thumb_max_width"
		android:layout_marginRight="@dimen/container_fastscroll_thumb_max_width"
		android:singleLine="true"
		android:textColor="#4c4c4c"
		android:textColorHint="#9c9c9c"
		android:textSize="16sp" />
		</LinearLayout>

		</com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>
		</com.android.launcher3.allapps.AllAppsContainerView>
		No newline at end of file