am 4a6da95d: am d8288538: Merge "Implement hotspot tile" into lmp-dev (a3b8fb07) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,13 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".qs.tiles.HotspotTile$APChangedReceiver"
		androidprv:primaryUserOnly="true">
		<intent-filter>
		<action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
		</intent-filter>
		</receiver>

		<activity android:name=".usb.UsbStorageActivity"
		android:label="@*android:string/usb_storage_activity_title"
		android:excludeFromRecents="true">

packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml

+6 −8

Original line number	Diff line number	Diff line
		@@ -15,16 +15,14 @@ Copyright (C) 2014 The Android Open Source Project
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android" >
		<size
		android:width="64dp"
		android:height="64dp"/>
		android:width="64.0dp"
		android:height="64.0dp"/>

		<viewport
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"/>
		android:viewportWidth="48.0"
		android:viewportHeight="48.0"/>

		<path
		android:fill="#00000000"
		android:stroke="#CCCCCC"
		android:strokeWidth="1.0"
		android:pathData="M12.0,11.0c-1.1,0.0 -2.0,0.9 -2.0,2.0c0.0,1.1 0.9,2.0 2.0,2.0c1.1,0.0 2.0,-0.9 2.0,-2.0C14.0,11.9 13.1,11.0 12.0,11.0zM18.0,13.0c0.0,-3.3 -2.7,-6.0 -6.0,-6.0c-3.3,0.0 -6.0,2.7 -6.0,6.0c0.0,2.2 1.2,4.1 3.0,5.2l1.0,-1.7c-1.2,-0.7 -2.0,-2.0 -2.0,-3.4c0.0,-2.2 1.8,-4.0 4.0,-4.0s4.0,1.8 4.0,4.0c0.0,1.5 -0.8,2.8 -2.0,3.4l1.0,1.7C16.8,17.1 18.0,15.2 18.0,13.0zM12.0,3.0C6.5,3.0 2.0,7.5 2.0,13.0c0.0,3.7 2.0,6.9 5.0,8.6l1.0,-1.7c-2.4,-1.4 -4.0,-4.0 -4.0,-6.9c0.0,-4.4 3.6,-8.0 8.0,-8.0s8.0,3.6 8.0,8.0c0.0,3.0 -1.6,5.5 -4.0,6.9l1.0,1.7c3.0,-1.7 5.0,-5.0 5.0,-8.6C22.0,7.5 17.5,3.0 12.0,3.0z"/>
		android:fill="#4DFFFFFF"
		android:pathData="M35.099998,28.500000c0.600000,-1.400000 0.900000,-2.900000 0.900000,-4.500000c0.000000,-6.600000 -5.400000,-12.000000 -12.000000,-12.000000c-1.600000,0.000000 -3.100000,0.300000 -4.500000,0.900000l3.200000,3.200000c0.400000,-0.100000 0.800000,-0.100000 1.200000,-0.100000c4.400000,0.000000 8.000000,3.600000 8.000000,8.000000c0.000000,0.400000 0.000000,0.800000 -0.100000,1.300000L35.099998,28.500000zM24.000000,8.000000c8.800000,0.000000 16.000000,7.200000 16.000000,16.000000c0.000000,2.700000 -0.700000,5.200000 -1.900000,7.500000l2.900000,2.900000c1.900000,-3.000000 3.000000,-6.600000 3.000000,-10.400000c0.000000,-11.000000 -9.000000,-20.000000 -20.000000,-20.000000c-3.800000,0.000000 -7.400000,1.100000 -10.400000,2.900000l2.900000,2.900000C18.700001,8.700000 21.299999,8.000000 24.000000,8.000000zM6.500000,5.000000L4.000000,7.500000l4.200000,4.200000C5.600000,15.100000 4.000000,19.400000 4.000000,24.000000c0.000000,7.400000 4.000000,13.800000 10.000000,17.299999l2.000000,-3.500000c-4.800000,-2.800000 -8.000000,-7.900000 -8.000000,-13.800000c0.000000,-3.500000 1.100000,-6.800000 3.100000,-9.400000l2.900000,2.900000C12.700000,19.400000 12.000000,21.600000 12.000000,24.000000c0.000000,4.400000 2.400000,8.300000 6.000000,10.400000l2.000000,-3.500000c-2.400000,-1.400000 -4.000000,-3.900000 -4.000000,-6.900000c0.000000,-1.300000 0.300000,-2.500000 0.900000,-3.600000l3.200000,3.200000c0.000000,0.100000 0.000000,0.300000 0.000000,0.400000c0.000000,2.200000 1.800000,4.000000 4.000000,4.000000c0.100000,0.000000 0.300000,0.000000 0.400000,0.000000l0.000000,0.000000l0.000000,0.000000l15.000000,15.000000l2.500000,-2.500000L8.500000,7.000000L6.500000,5.000000z"/>
		</vector>

packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,14 +15,14 @@ Copyright (C) 2014 The Android Open Source Project
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android" >
		<size
		android:width="64dp"
		android:height="64dp"/>
		android:width="64.0dp"
		android:height="64.0dp"/>

		<viewport
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"/>
		android:viewportWidth="48.0"
		android:viewportHeight="48.0"/>

		<path
		android:fill="#FFFFFFFF"
		android:pathData="M12.0,11.0c-1.1,0.0 -2.0,0.9 -2.0,2.0c0.0,1.1 0.9,2.0 2.0,2.0c1.1,0.0 2.0,-0.9 2.0,-2.0C14.0,11.9 13.1,11.0 12.0,11.0zM18.0,13.0c0.0,-3.3 -2.7,-6.0 -6.0,-6.0c-3.3,0.0 -6.0,2.7 -6.0,6.0c0.0,2.2 1.2,4.1 3.0,5.2l1.0,-1.7c-1.2,-0.7 -2.0,-2.0 -2.0,-3.4c0.0,-2.2 1.8,-4.0 4.0,-4.0s4.0,1.8 4.0,4.0c0.0,1.5 -0.8,2.8 -2.0,3.4l1.0,1.7C16.8,17.1 18.0,15.2 18.0,13.0zM12.0,3.0C6.5,3.0 2.0,7.5 2.0,13.0c0.0,3.7 2.0,6.9 5.0,8.6l1.0,-1.7c-2.4,-1.4 -4.0,-4.0 -4.0,-6.9c0.0,-4.4 3.6,-8.0 8.0,-8.0s8.0,3.6 8.0,8.0c0.0,3.0 -1.6,5.5 -4.0,6.9l1.0,1.7c3.0,-1.7 5.0,-5.0 5.0,-8.6C22.0,7.5 17.5,3.0 12.0,3.0z"/>
		android:pathData="M24.000000,22.000000c-2.200000,0.000000 -4.000000,1.800000 -4.000000,4.000000c0.000000,2.200000 1.800000,4.000000 4.000000,4.000000c2.200000,0.000000 4.000000,-1.800000 4.000000,-4.000000C28.000000,23.799999 26.200001,22.000000 24.000000,22.000000zM36.000000,26.000000c0.000000,-6.600000 -5.400000,-12.000000 -12.000000,-12.000000c-6.600000,0.000000 -12.000000,5.400000 -12.000000,12.000000c0.000000,4.400000 2.400000,8.300000 6.000000,10.400000l2.000000,-3.500000c-2.400000,-1.400000 -4.000000,-3.900000 -4.000000,-6.900000c0.000000,-4.400000 3.600000,-8.000000 8.000000,-8.000000s8.000000,3.600000 8.000000,8.000000c0.000000,3.000000 -1.600000,5.500000 -4.000000,6.900000l2.000000,3.500000C33.599998,34.299999 36.000000,30.400000 36.000000,26.000000zM24.000000,6.000000C13.000000,6.000000 4.000000,15.000000 4.000000,26.000000c0.000000,7.400000 4.000000,13.800000 10.000000,17.299999l2.000000,-3.500000c-4.800000,-2.800000 -8.000000,-7.900000 -8.000000,-13.800000c0.000000,-8.800000 7.200000,-16.000000 16.000000,-16.000000s16.000000,7.200000 16.000000,16.000000c0.000000,5.900000 -3.200000,11.100000 -8.000000,13.800000l2.000000,3.500000c6.000000,-3.500000 10.000000,-9.900000 10.000000,-17.299999C44.000000,15.000000 35.000000,6.000000 24.000000,6.000000z"/>
		</vector>

packages/SystemUI/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -164,5 +164,8 @@

		<!-- Volume: time to delay dismissing the volume panel after a click is performed -->
		<integer name="volume_panel_dismiss_delay">200</integer>

		<!-- Hotspot tile: number of days to show after feature is used. -->
		<integer name="days_to_show_hotspot">30</integer>
		</resources>

packages/SystemUI/src/com/android/systemui/qs/QSTile.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import com.android.systemui.statusbar.policy.Listenable;
		import com.android.systemui.statusbar.policy.LocationController;
		import com.android.systemui.statusbar.policy.NetworkController;
		import com.android.systemui.statusbar.policy.RotationLockController;
		import com.android.systemui.statusbar.policy.TetheringController;
		import com.android.systemui.statusbar.policy.HotspotController;
		import com.android.systemui.statusbar.policy.ZenModeController;
		import com.android.systemui.volume.VolumeComponent;

		@@ -251,7 +251,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
		RotationLockController getRotationLockController();
		NetworkController getNetworkController();
		ZenModeController getZenModeController();
		TetheringController getTetheringController();
		HotspotController getHotspotController();
		CastController getCastController();
		FlashlightController getFlashlightController();
		KeyguardMonitor getKeyguardMonitor();