Merge "Phase 1 of status bar system event animations" into sc-dev (e438034a) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/system_animation_ongoing_dot.xml

0 → 100644

+26 −0

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

		<!-- dot drawable for ongoing system privacy events -->
		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="oval">
		<solid
		android:color="@color/privacy_circle"/>
		<size
		android:width="6dp"
		android:height="6dp"
		/>
		</shape>
		No newline at end of file

packages/SystemUI/res/layout/rounded_corners.xml

+39 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		** See the License for the specific language governing permissions and
		** limitations under the License.
		-->

		<!-- TODO: remove this in favor of requiring top and bottom layouts -->
		<com.android.systemui.RegionInterceptingFrameLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/rounded_corners_default"
		@@ -26,6 +28,25 @@
		android:layout_gravity="left\|top"
		android:tint="#ff000000"
		android:src="@drawable/rounded"/>

		<FrameLayout
		android:id="@+id/privacy_dot_left_container"
		android:layout_height="@dimen/status_bar_height"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginLeft="8dp"
		android:layout_gravity="left\|top"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot_left"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />
		</FrameLayout>


		<ImageView
		android:id="@+id/right"
		android:layout_width="12dp"
		@@ -33,4 +54,22 @@
		android:tint="#ff000000"
		android:layout_gravity="right\|bottom"
		android:src="@drawable/rounded"/>
		<FrameLayout
		android:id="@+id/privacy_dot_right_container"
		android:layout_height="@dimen/status_bar_height"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginRight="8dp"
		android:layout_gravity="right\|top"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot_right"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />

		</FrameLayout>

		</com.android.systemui.RegionInterceptingFrameLayout>

packages/SystemUI/res/layout/rounded_corners_bottom.xml

+35 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,24 @@
		android:layout_gravity="left\|bottom"
		android:tint="#ff000000"
		android:src="@drawable/rounded_corner_bottom"/>

		<FrameLayout
		android:id="@+id/privacy_dot_left_container"
		android:layout_height="@dimen/status_bar_height"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginLeft="0dp"
		android:layout_gravity="left\|bottom"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical\|right"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />
		</FrameLayout>

		<ImageView
		android:id="@+id/right"
		android:layout_width="12dp"
		@@ -33,4 +51,21 @@
		android:tint="#ff000000"
		android:layout_gravity="right\|bottom"
		android:src="@drawable/rounded_corner_bottom"/>
		<FrameLayout
		android:id="@+id/privacy_dot_right_container"
		android:layout_height="@dimen/status_bar_height"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginRight="0dp"
		android:layout_gravity="right\|bottom"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical\|left"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />
		</FrameLayout>

		</com.android.systemui.RegionInterceptingFrameLayout>

packages/SystemUI/res/layout/rounded_corners_top.xml

+38 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,24 @@
		android:layout_gravity="left\|top"
		android:tint="#ff000000"
		android:src="@drawable/rounded_corner_top"/>

		<FrameLayout
		android:id="@+id/privacy_dot_left_container"
		android:layout_height="@*android:dimen/status_bar_height_portrait"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginLeft="0dp"
		android:layout_gravity="left\|top"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical\|right"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />
		</FrameLayout>

		<ImageView
		android:id="@+id/right"
		android:layout_width="12dp"
		@@ -33,4 +51,24 @@
		android:tint="#ff000000"
		android:layout_gravity="right\|top"
		android:src="@drawable/rounded_corner_top"/>

		<FrameLayout
		android:id="@+id/privacy_dot_right_container"
		android:layout_height="@*android:dimen/status_bar_height_portrait"
		android:layout_width="wrap_content"
		android:layout_marginTop="@dimen/status_bar_padding_top"
		android:layout_marginRight="0dp"
		android:layout_gravity="right\|top"
		android:visibility="invisible" >
		<ImageView
		android:id="@+id/privacy_dot"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical\|left"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="visible" />

		</FrameLayout>


		</com.android.systemui.RegionInterceptingFrameLayout>

packages/SystemUI/res/layout/system_event_animation_window.xml

0 → 100644

+35 −0

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

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/container"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical\|end"
		android:paddingTop="@dimen/status_bar_padding_top"
		android:paddingEnd="8dp"
		>

		<ImageView
		android:id="@+id/dot_view"
		android:layout_width="10dp"
		android:layout_height="10dp"
		android:layout_gravity="center_vertical\|end"
		android:src="@drawable/system_animation_ongoing_dot"
		android:visibility="invisible"
		/>

		</FrameLayout>
		No newline at end of file