Merge changes from topic \'qs-tiles\' into nyc-dev (60a2e4d0) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+22 −0

Original line number	Diff line number	Diff line
		@@ -2915,5 +2915,27 @@
		</intent-filter>
		</receiver>

		<!-- Quick Settings tiles for Developer Options -->
		<service
		android:name=".qstile.DevelopmentTiles$ShowLayout"
		android:label="@string/debug_layout"
		android:icon="@drawable/tile_icon_show_layout"
		android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
		android:enabled="false">
		<intent-filter>
		<action android:name="android.service.quicksettings.action.QS_TILE" />
		</intent-filter>
		</service>
		<service
		android:name=".qstile.DevelopmentTiles$GPUProfiling"
		android:label="@string/track_frame_time"
		android:icon="@drawable/tile_icon_graphics"
		android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
		android:enabled="false">
		<intent-filter>
		<action android:name="android.service.quicksettings.action.QS_TILE" />
		</intent-filter>
		</service>
		<!-- This is the longest AndroidManifest.xml ever. -->
		</application>
		</manifest>

res/drawable/tile_icon_graphics.xml

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M23,1v22H1V1H23 M24,0H0v24h24V0L24,0z"/>
		<path
		android:strokeColor="#FFFFFFFF"
		android:strokeWidth="0.667"
		android:pathData="M5,19L1,23"/>
		<path
		android:strokeColor="#FFFFFFFF"
		android:strokeWidth="0.667"
		android:pathData="M1,1L5,5"/>
		<path
		android:strokeColor="#FFFFFFFF"
		android:strokeWidth="0.667"
		android:pathData="M19,5L23,1"/>
		<path
		android:strokeColor="#FFFFFFFF"
		android:strokeWidth="0.667"
		android:pathData="M19,19L23,23"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M14,3.8l-4,0l-0.2,-0.8l4.4,0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M18.8,5.2v13.5H5.2V5.2H18.8 M19.5,4.5h-15v15h15V4.5L19.5,4.5z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M6.5,9.5h5v11h-5z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M12.5,16.5h5v5h-5z"/>
		</vector>

res/drawable/tile_icon_show_layout.xml

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M12,7.2c-3.2,0 -5.9,2 -7,4.8c1.1,2.8 3.8,4.8 7,4.8s5.9,-2 7,-4.8C17.9,9.2 15.2,7.2 12,7.2zM12,15.2c-1.8,0 -3.2,-1.4 -3.2,-3.2s1.4,-3.2 3.2,-3.2s3.2,1.4 3.2,3.2S13.8,15.2 12,15.2zM12,10.1c-1.1,0 -1.9,0.9 -1.9,1.9s0.9,1.9 1.9,1.9s1.9,-0.9 1.9,-1.9S13.1,10.1 12,10.1z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M0.0,6.0h1.0v12.0h-1.0z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M6.0,0.0h12.0v1.0h-12.0z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M23.0,6.0h1.0v12.0h-1.0z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M6.0,23.0h12.0v1.0h-12.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M9.5,6.0h5.0v1.0h-5.0z"/>
		<path
		android:fillColor="#80FFFFFF"
		android:pathData="M9.5,17.0h5.0v1.0h-5.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M4.5,7.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0l0.0,-5.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M14.5,6.0l0.0,1.0l5.0,0.0l0.0,5.0l0.0,5.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l0.0,-6.0z"/>
		</vector>

src/com/android/settings/DevelopmentSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2078,7 +2078,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		}
		};

		static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
		public static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
		@Override
		protected Void doInBackground(Void... params) {
		String[] services = ServiceManager.listServices();

src/com/android/settings/SettingsActivity.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ import com.android.settings.notification.ZenModeVisualInterruptionSettings;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.print.PrintJobSettingsFragment;
		import com.android.settings.print.PrintSettingsFragment;
		import com.android.settings.qstile.DevelopmentTiles;
		import com.android.settings.search.DynamicIndexableContentMonitor;
		import com.android.settings.search.Index;
		import com.android.settings.sim.SimSettings;
		@@ -1067,12 +1068,14 @@ public class SettingsActivity extends SettingsDrawerActivity
		pm.hasSystemFeature(PackageManager.FEATURE_PRINTING), isAdmin, pm);

		final boolean showDev = mDevelopmentPreferences.getBoolean(
		DevelopmentSettings.PREF_SHOW,
		android.os.Build.TYPE.equals("eng"));
		DevelopmentSettings.PREF_SHOW, android.os.Build.TYPE.equals("eng"))
		&& !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);
		setTileEnabled(new ComponentName(packageName,
		Settings.DevelopmentSettingsActivity.class.getName()),
		showDev && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES),
		isAdmin, pm);
		showDev, isAdmin, pm);

		// Reveal development-only quick settings tiles
		DevelopmentTiles.setTilesEnabled(this, showDev);

		if (UserHandle.MU_ENABLED && !isAdmin) {
		// When on restricted users, disable all extra categories (but only the settings ones).