Merge "Adjust layout for Slice InputRange" into rvc-dev (af4d55e7) · Commits · e / os / android_packages_apps_Settings

res/layout/panel_slice_slider_row.xml

0 → 100644

+30 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!--
			Copyright (C) 2020 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.
			-->
			<LinearLayout
			xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="vertical">

			<androidx.slice.widget.SliceView
			android:id="@+id/slice_view"
			style="@style/SliceViewSliderStyle"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingStart="8dp"
			android:paddingEnd="8dp"/>
			</LinearLayout>
			No newline at end of file

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -512,6 +512,17 @@
	<item name="android:background">?android:attr/colorBackgroundFloating</item>		<item name="android:background">?android:attr/colorBackgroundFloating</item>
	</style>		</style>

			<style name="SliceViewSliderStyle">
			<item name="rowStyle">@style/SliceRowSliderStyle</item>
			<item name="android:background">?android:attr/colorBackgroundFloating</item>
			</style>

			<style name="SliceRowSliderStyle" parent="SliceRowStyle">
			<!-- Align text with slider -->
			<item name="titleStartPadding">12dp</item>
			<item name="subContentStartPadding">12dp</item>
			</style>

	<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">		<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">
	<item name="android:background">@color/contextual_card_background</item>		<item name="android:background">@color/contextual_card_background</item>
	</style>		</style>

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -156,4 +156,9 @@ public class MediaOutputGroupPanel implements PanelContent, LocalMediaManager.De
	public int getMetricsCategory() {		public int getMetricsCategory() {
	return SettingsEnums.PANEL_MEDIA_OUTPUT_GROUP;		return SettingsEnums.PANEL_MEDIA_OUTPUT_GROUP;
	}		}

			@Override
			public int getViewType() {
			return PanelContent.VIEW_TYPE_SLIDER;
			}
	}		}

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -240,4 +240,9 @@ public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceC
	mLocalMediaManager.unregisterCallback(this);		mLocalMediaManager.unregisterCallback(this);
	mLocalMediaManager.stopScan();		mLocalMediaManager.stopScan();
	}		}

			@Override
			public int getViewType() {
			return PanelContent.VIEW_TYPE_SLIDER;
			}
	}		}

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,8 @@ import java.util.List;
	*/		*/
	public interface PanelContent extends Instrumentable {		public interface PanelContent extends Instrumentable {

			int VIEW_TYPE_SLIDER = 1;

	/**		/**
	* @return a icon for the title of the Panel.		* @return a icon for the title of the Panel.
	*/		*/
	@@ -101,4 +103,11 @@ public interface PanelContent extends Instrumentable {
	* @param callback the callback to add.		* @param callback the callback to add.
	*/		*/
	default void registerCallback(PanelContentCallback callback) {}		default void registerCallback(PanelContentCallback callback) {}

			/**
			* @return a view type to customized it. 0 for default layout.
			*/
			default int getViewType() {
			return 0;
			}
	}		}