Merge "Support contextual suggestion" (21338568) · Commits · e / os / android_packages_apps_Settings

res/layout/settings_homepage_container.xml

+36 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,41 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:touchscreenBlocksFocus="false"		android:touchscreenBlocksFocus="false"
	android:keyboardNavigationCluster="false">		android:keyboardNavigationCluster="false">
			<LinearLayout
			android:id="@+id/app_bar_container"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical"
			app:layout_scrollFlags="scroll\|enterAlways\|enterAlwaysCollapsed">

			<LinearLayout
			android:id="@+id/contextual_suggestion_content"
			android:layout_width="match_parent"
			android:layout_height="@dimen/suggestion_height"
			android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
			android:paddingBottom="@dimen/suggestion_padding_bottom"
			android:orientation="vertical"
			android:gravity="bottom"
			android:visibility="gone">

			<TextView
			android:id="@+id/suggestion_title"
			android:text="@string/settings_label"
			style="@style/ContextualSuggestionText"/>

			<Button
			android:id="@+id/suggestion_button"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_marginTop="@dimen/suggestion_button_margin_top"
			android:paddingHorizontal="@dimen/suggestion_button_padding_horizontal"
			android:visibility="gone"
			style="@style/ActionPrimaryButton"/>

			</LinearLayout>

	<include layout="@layout/search_bar"/>		<include layout="@layout/search_bar"/>

			</LinearLayout>
	</com.google.android.material.appbar.AppBarLayout>		</com.google.android.material.appbar.AppBarLayout>
	</androidx.coordinatorlayout.widget.CoordinatorLayout>		</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/values/dimens.xml

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -123,13 +123,20 @@
	<dimen name="switchbar_subsettings_margin_start">72dp</dimen>		<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
	<dimen name="switchbar_subsettings_margin_end">16dp</dimen>		<dimen name="switchbar_subsettings_margin_end">16dp</dimen>

			<!-- Search bar and avatar -->
	<dimen name="search_bar_margin">24dp</dimen>		<dimen name="search_bar_margin">24dp</dimen>
	<dimen name="search_bar_height">48dp</dimen>		<dimen name="search_bar_height">48dp</dimen>
	<dimen name="search_bar_text_size">16dp</dimen>		<dimen name="search_bar_text_size">16sp</dimen>
	<dimen name="search_bar_card_elevation">2dp</dimen>		<dimen name="search_bar_card_elevation">2dp</dimen>
	<dimen name="search_bar_content_inset">64dp</dimen>		<dimen name="search_bar_content_inset">64dp</dimen>
	<dimen name="avatar_length">@dimen/search_bar_height</dimen>		<dimen name="avatar_length">@dimen/search_bar_height</dimen>

			<!-- Contextual suggestions -->
			<dimen name="suggestion_height">224dp</dimen>
			<dimen name="suggestion_padding_horizontal">24dp</dimen>
			<dimen name="suggestion_padding_bottom">8dp</dimen>
			<dimen name="suggestion_button_margin_top">16dp</dimen>
			<dimen name="suggestion_button_padding_horizontal">24dp</dimen>

	<!-- Dimensions for Wifi Assistant Card -->		<!-- Dimensions for Wifi Assistant Card -->
	<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>		<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>

res/values/styles.xml

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -782,6 +782,14 @@
	<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
	</style>		</style>

			<style name="ContextualSuggestionText" parent="@android:style/TextAppearance.DeviceDefault">
			<item name="android:layout_width">match_parent</item>
			<item name="android:layout_height">wrap_content</item>
			<item name="android:textSize">32sp</item>
			<item name="android:textColor">?android:attr/textColorPrimary</item>
			<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
			</style>

	<style name="RequestManageCredentialsButtonPanel">		<style name="RequestManageCredentialsButtonPanel">
	<item name="android:paddingStart">12dp</item>		<item name="android:paddingStart">12dp</item>
	<item name="android:paddingEnd">12dp</item>		<item name="android:paddingEnd">12dp</item>

res/xml/top_level_settings_grouped.xml

+14 −19

Original line number	Original line	Diff line number	Diff line
	@@ -20,10 +20,6 @@
	xmlns:settings="http://schemas.android.com/apk/res-auto"		xmlns:settings="http://schemas.android.com/apk/res-auto"
	android:key="top_level_settings_grouped">		android:key="top_level_settings_grouped">

	<PreferenceCategory
	android:key="connectivity"
	android:order="-140"
	settings:allowDividerAbove="false">
	<Preference		<Preference
	android:fragment="com.android.settings.network.NetworkDashboardFragment"		android:fragment="com.android.settings.network.NetworkDashboardFragment"
	android:icon="@drawable/ic_homepage_network"		android:icon="@drawable/ic_homepage_network"
	@@ -39,7 +35,6 @@
	android:order="-130"		android:order="-130"
	android:title="@string/connected_devices_dashboard_title"		android:title="@string/connected_devices_dashboard_title"
	settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>		settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
	</PreferenceCategory>

	<PreferenceCategory		<PreferenceCategory
	android:key="apps"		android:key="apps"

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.content.Context;
	import android.content.SharedPreferences;		import android.content.SharedPreferences;

	import androidx.annotation.NonNull;		import androidx.annotation.NonNull;
			import androidx.fragment.app.Fragment;

	/** Interface should be implemented if you have added new suggestions */		/** Interface should be implemented if you have added new suggestions */
	public interface SuggestionFeatureProvider {		public interface SuggestionFeatureProvider {
	@@ -42,4 +43,9 @@ public interface SuggestionFeatureProvider {
	* Returns the {@link SharedPreferences} that holds metadata for suggestions.		* Returns the {@link SharedPreferences} that holds metadata for suggestions.
	*/		*/
	SharedPreferences getSharedPrefs(Context context);		SharedPreferences getSharedPrefs(Context context);

			/**
			* Returns the class of {@link Fragment} that supports contextual suggestion.
			*/
			Class<? extends Fragment> getContextualSuggestionFragment();
	}		}