Re-add expanded desktop tile. (0938f588) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/cm/QSUtils.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,8 +55,8 @@ public class QSUtils {
		}

		public static boolean expandedDesktopEnabled(ContentResolver resolver) {
		/*return (Settings.System.getIntForUser(resolver, Settings.System.EXPANDED_DESKTOP_STYLE, 0,
		UserHandle.USER_CURRENT_OR_SELF) != 0);*/ return false;
		return Settings.System.getIntForUser(resolver, Settings.System.EXPANDED_DESKTOP_STYLE,
		0, UserHandle.USER_CURRENT_OR_SELF) != 0;
		}

		public static boolean deviceSupportsNfc(Context ctx) {

packages/SystemUI/src/com/android/systemui/quicksettings/ExpandedDesktopTile.java

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		package com.android.systemui.quicksettings;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.net.Uri;
		import android.os.Handler;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.view.LayoutInflater;
		import android.view.View;

		import com.android.systemui.R;
		import com.android.systemui.statusbar.phone.QuickSettingsContainerView;
		import com.android.systemui.statusbar.phone.QuickSettingsController;

		public class ExpandedDesktopTile extends QuickSettingsTile {
		private boolean mEnabled = false;

		public ExpandedDesktopTile(Context context,
		QuickSettingsController qsc, Handler handler) {
		super(context, qsc);

		mOnClick = new View.OnClickListener() {
		@Override
		public void onClick(View v) {
		// Change the system setting
		Settings.System.putIntForUser(mContext.getContentResolver(),
		Settings.System.EXPANDED_DESKTOP_STATE, mEnabled ? 0 : 1,
		UserHandle.USER_CURRENT);
		}
		};

		mOnLongClick = new View.OnLongClickListener() {
		@Override
		public boolean onLongClick(View v) {
		Intent intent = new Intent(Intent.ACTION_MAIN);
		intent.setClassName("com.android.settings",
		"com.android.settings.Settings$SystemSettingsActivity");
		startSettingsActivity(intent);
		return true;
		}
		};

		Uri stateUri = Settings.System.getUriFor(Settings.System.EXPANDED_DESKTOP_STATE);
		qsc.registerObservedContent(stateUri, this);
		}

		void onPostCreate() {
		updateTile();
		super.onPostCreate();
		}

		@Override
		public void updateResources() {
		updateTile();
		super.updateResources();
		}

		private synchronized void updateTile() {
		mEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),
		Settings.System.EXPANDED_DESKTOP_STATE, 0, UserHandle.USER_CURRENT) == 1;
		if (mEnabled) {
		mDrawable = R.drawable.ic_qs_expanded_desktop_on;
		mLabel = mContext.getString(R.string.quick_settings_expanded_desktop);
		} else {
		mDrawable = R.drawable.ic_qs_expanded_desktop_off;
		mLabel = mContext.getString(R.string.quick_settings_expanded_desktop_off);
		}
		}

		@Override
		public void onChangeUri(ContentResolver resolver, Uri uri) {
		updateResources();
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ import com.android.systemui.quicksettings.BrightnessTile;
		import com.android.systemui.quicksettings.BugReportTile;
		import com.android.systemui.quicksettings.CameraTile;
		//import com.android.systemui.quicksettings.DockBatteryTile;
		//import com.android.systemui.quicksettings.ExpandedDesktopTile;
		import com.android.systemui.quicksettings.ExpandedDesktopTile;
		import com.android.systemui.quicksettings.GPSTile;
		import com.android.systemui.quicksettings.InputMethodTile;
		import com.android.systemui.quicksettings.LteTile;
		@@ -263,11 +263,11 @@ public class QuickSettingsController {
		qs = new QuietHoursTile(mContext, this);
		} else if (tile.equals(TILE_VOLUME)) {
		qs = new VolumeTile(mContext, this, mHandler);
		/* } else if (tile.equals(TILE_EXPANDEDDESKTOP)) {
		} else if (tile.equals(TILE_EXPANDEDDESKTOP)) {
		mTileStatusUris.add(Settings.System.getUriFor(Settings.System.EXPANDED_DESKTOP_STYLE));
		if (QSUtils.expandedDesktopEnabled(resolver)) {
		qs = new ExpandedDesktopTile(mContext, this, mHandler);
		}*/
		}
		} else if (tile.equals(TILE_NETWORKADB)) {
		mTileStatusUris.add(Settings.Global.getUriFor(Settings.Global.ADB_ENABLED));
		if (QSUtils.adbEnabled(resolver)) {