Merge "Clean up activity a bit and disable it by default" into oc-dev (1df5ca59) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/ic_activity_down.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2017 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="5dp"
		android:height="17.0dp"
		android:viewportWidth="7.1"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M3.6000004,13.2l-3.6,0.0 3.6,7.3 0.0,0.0 0.0,0.0 0.0,0.0 0.0,0.0 3.5,-7.3z"/>
		</vector>

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2017 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="5dp"
		android:height="17.0dp"
		android:viewportWidth="7.1"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M3.6000004,10.8l3.5,0.0 -3.5,-7.3 0.0,0.0 0.0,0.0 0.0,0.0 0.0,0.0 -3.6,7.3z"/>
		</vector>

+56 −37

Original line number	Diff line number	Diff line
		@@ -16,13 +16,37 @@
		** limitations under the License.
		*/
		-->
		<FrameLayout
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:id="@+id/mobile_combo"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		>
		<FrameLayout
		android:layout_height="17dp"
		android:layout_width="wrap_content">
		<ImageView
		android:id="@+id/mobile_in"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:src="@drawable/ic_activity_down"
		android:visibility="gone"
		android:paddingEnd="2dp"
		/>
		<ImageView
		android:id="@+id/mobile_out"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:src="@drawable/ic_activity_up"
		android:paddingEnd="2dp"
		android:visibility="gone"
		/>
		</FrameLayout>
		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		<com.android.systemui.statusbar.AnimatedImageView
		android:theme="@style/DualToneLightTheme"
		android:id="@+id/mobile_signal"
		@@ -54,10 +78,5 @@
		android:src="@drawable/stat_sys_roaming"
		android:contentDescription="@string/accessibility_data_connection_roaming"
		android:visibility="gone" />
		<ImageView
		android:id="@+id/mobile_inout"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:visibility="gone"
		/>
		</FrameLayout>
		</LinearLayout>

+20 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,26 @@
		android:alpha="0.0"
		/>
		</FrameLayout>
		<FrameLayout
		android:layout_height="17dp"
		android:layout_width="wrap_content">
		<ImageView
		android:id="@+id/wifi_in"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:src="@drawable/ic_activity_down"
		android:visibility="gone"
		android:paddingEnd="2dp"
		/>
		<ImageView
		android:id="@+id/wifi_out"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:src="@drawable/ic_activity_up"
		android:paddingEnd="2dp"
		android:visibility="gone"
		/>
		</FrameLayout>
		<FrameLayout
		android:id="@+id/wifi_combo"
		android:layout_height="wrap_content"

+3 −0

Original line number	Diff line number	Diff line
		@@ -332,4 +332,7 @@
		<!-- Whether or the notifications can be shown and dismissed with a drag. -->
		<bool name="config_enableNotificationShadeDrag">true</bool>

		<!-- Whether to show activity indicators in the status bar -->
		<bool name="config_showActivity">false</bool>

		</resources>