Merge "Loading suggestions via legacy SuggestionService sometimes" (08d8ed80) · Commits · e / os / android_packages_apps_Settings

res/layout/homepage_condition_full_tile.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@

		<ImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/suggestion_card_icon_size"
		android:layout_height="@dimen/suggestion_card_icon_size"
		android:layout_width="@dimen/homepage_card_icon_size"
		android:layout_height="@dimen/homepage_card_icon_size"
		android:tint="?android:attr/colorAccent"/>

		<LinearLayout

res/layout/homepage_condition_half_tile.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@

		<ImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/suggestion_card_icon_size"
		android:layout_height="@dimen/suggestion_card_icon_size"
		android:layout_width="@dimen/homepage_card_icon_size"
		android:layout_height="@dimen/homepage_card_icon_size"
		android:tint="?android:attr/colorAccent"/>

		<TextView

res/layout/homepage_suggestion_tile.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2018 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.
		-->

		<androidx.cardview.widget.CardView
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/suggestion_card"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/ContextualCardStyle">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="112dp"
		android:paddingBottom="8dp"
		android:orientation="vertical">

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal">

		<ImageView
		android:id="@android:id/icon"
		android:layout_width="@dimen/homepage_card_icon_size"
		android:layout_height="@dimen/homepage_card_icon_size"
		style="@style/SuggestionCardIcon"
		android:layout_marginTop="16dp"
		android:layout_marginBottom="6dp"/>

		</RelativeLayout>

		<TextView
		android:id="@android:id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/SuggestionCardText"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.SuggestionTitle"
		android:fadingEdge="horizontal"/>

		<TextView
		android:id="@android:id/summary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/SuggestionCardText"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.SuggestionSummary"/>

		</LinearLayout>

		</androidx.cardview.widget.CardView>
		No newline at end of file

res/values/config.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,12 @@
		have distinct intensity levels -->
		<bool name="config_vibration_supports_multiple_intensities">false</bool>

		<!--
		Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
		Default to true as not all devices support contextual cards.
		-->
		<bool name="config_use_legacy_suggestion">true</bool>

		<!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->
		<bool name="config_force_rounded_icon_TopLevelSettings">true</bool>

res/values/dimens.xml

+1 −11

Original line number	Diff line number	Diff line
		@@ -303,17 +303,6 @@
		<dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
		<dimen name="condition_header_height">36dp</dimen>

		<!-- Suggestion cards size and padding -->
		<dimen name="suggestion_card_icon_size">24dp</dimen>
		<dimen name="suggestion_card_outer_margin">14dp</dimen>
		<dimen name="suggestion_card_inner_margin">12dp</dimen>
		<dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
		<dimen name="suggestion_card_corner_radius">2dp</dimen>
		<dimen name="suggestion_card_icon_side_margin">12dp</dimen>
		<dimen name="suggestion_card_button_side_margin">8dp</dimen>
		<dimen name="suggestion_card_button_top_margin">16dp</dimen>
		<dimen name="suggestion_card_button_bottom_margin">18dp</dimen>

		<!-- Condition cards size and padding -->
		<dimen name="condition_card_elevation">2dp</dimen>

		@@ -331,6 +320,7 @@
		<dimen name="homepage_bottombar_fab_cradle">68dp</dimen>

		<!-- Homepage cards size and padding -->
		<dimen name="homepage_card_icon_size">24dp</dimen>
		<dimen name="homepage_card_corner_radius">8dp</dimen>
		<dimen name="homepage_card_elevation">2dp</dimen>
		<dimen name="homepage_card_vertical_margin">4dp</dimen>