Merge "Change brightness mirror background" into sc-dev (952b75ea) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,5 +16,5 @@
	-->		-->
	<shape xmlns:android="http://schemas.android.com/apk/res/android">		<shape xmlns:android="http://schemas.android.com/apk/res/android">
	<solid android:color="?attr/underSurfaceColor" />		<solid android:color="?attr/underSurfaceColor" />
	<corners android:radius="8dp" />		<corners android:radius="@dimen/rounded_slider_background_rounded_corner" />
	</shape>		</shape>

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,14 @@
	<FrameLayout		<FrameLayout
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	android:theme="@style/Theme.SystemUI.QuickSettings"		android:theme="@style/Theme.SystemUI.QuickSettings"
	android:id="@+id/brightness_mirror"		android:id="@+id/brightness_mirror_container"
	android:layout_width="@dimen/qs_panel_width"		android:layout_width="match_parent"
	android:layout_height="@dimen/brightness_mirror_height"		android:layout_height="wrap_content"
	android:layout_gravity="@integer/notification_panel_layout_gravity"		android:background="@drawable/brightness_mirror_background"
			android:layout_gravity="center_vertical"
			android:layout_margin="8dp"
			android:padding="@dimen/rounded_slider_background_padding"
			android:gravity="center"
	android:visibility="invisible">		android:visibility="invisible">

	</FrameLayout>		</FrameLayout>

+2 −7

Original line number	Original line	Diff line number	Diff line
	@@ -13,16 +13,12 @@
	See the License for the specific language governing permissions and		See the License for the specific language governing permissions and
	limitations under the License.		limitations under the License.
	-->		-->
	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
	android:layout_height="wrap_content"
	android:layout_width="match_parent"
	android:layout_gravity="center">

	<com.android.systemui.settings.brightness.BrightnessSliderView		<com.android.systemui.settings.brightness.BrightnessSliderView
			xmlns:android="http://schemas.android.com/apk/res/android"
	android:id="@+id/brightness_slider"		android:id="@+id/brightness_slider"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="@dimen/brightness_mirror_height"		android:layout_height="@dimen/brightness_mirror_height"
	android:layout_gravity="center_vertical"		android:layout_gravity="center"
	android:contentDescription="@string/accessibility_brightness"		android:contentDescription="@string/accessibility_brightness"
	android:importantForAccessibility="no" >		android:importantForAccessibility="no" >

	@@ -40,4 +36,3 @@
	android:splitTrack="false"		android:splitTrack="false"
	/>		/>
	</com.android.systemui.settings.brightness.BrightnessSliderView>		</com.android.systemui.settings.brightness.BrightnessSliderView>
	</FrameLayout>

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:visibility="invisible" />		android:visibility="invisible" />

	<include layout="@layout/brightness_mirror" />		<include layout="@layout/brightness_mirror_container" />

	<com.android.systemui.statusbar.ScrimView		<com.android.systemui.statusbar.ScrimView
	android:id="@+id/scrim_in_front"		android:id="@+id/scrim_in_front"

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1430,6 +1430,9 @@
	<dimen name="rounded_slider_track_width">4dp</dimen>		<dimen name="rounded_slider_track_width">4dp</dimen>
	<!-- rounded_slider_track_width / 2 -->		<!-- rounded_slider_track_width / 2 -->
	<dimen name="rounded_slider_track_corner_radius">2dp</dimen>		<dimen name="rounded_slider_track_corner_radius">2dp</dimen>
			<dimen name="rounded_slider_background_padding">8dp</dimen>
			<!-- rounded_slider_corner_radius + rounded_slider_background_padding -->
			<dimen name="rounded_slider_background_rounded_corner">32dp</dimen>

	<!-- inset for ic_lock_open within a DisabledUdfpsView -->		<!-- inset for ic_lock_open within a DisabledUdfpsView -->
	<dimen name="udfps_unlock_icon_inset">16dp</dimen>		<dimen name="udfps_unlock_icon_inset">16dp</dimen>