From 56e6dbd8b16f5bb0b58bad6dee824034783f4ddf Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Tue, 7 Jun 2011 15:29:07 -0400 Subject: DO NOT MERGE. Experimental compatibility mode UI. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ♫ Just another button, for you and me, in the status bar. ♫ (cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b) Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d --- .../ic_sysbar_zoom_default.png | Bin 0 -> 4050 bytes .../ic_sysbar_zoom_pressed.png | Bin 0 -> 7760 bytes .../ic_sysbar_zoom_default.png | Bin 0 -> 2642 bytes .../ic_sysbar_zoom_pressed.png | Bin 0 -> 4140 bytes packages/SystemUI/res/drawable/ic_sysbar_zoom.xml | 21 +++++++ .../SystemUI/res/layout-sw600dp/status_bar.xml | 7 +++ .../statusbar/policy/CompatModeButton.java | 63 +++++++++++++++++++++ .../systemui/statusbar/tablet/TabletStatusBar.java | 5 ++ 8 files changed, 96 insertions(+) create mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png create mode 100644 packages/SystemUI/res/drawable/ic_sysbar_zoom.xml create mode 100644 packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png new file mode 100644 index 000000000000..e2584e3a2f9a Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_default.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png new file mode 100644 index 000000000000..58b85102d9b3 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_zoom_pressed.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png new file mode 100644 index 000000000000..2795c345f62e Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_default.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png new file mode 100644 index 000000000000..bbed6a6467d6 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_zoom_pressed.png differ diff --git a/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml b/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml new file mode 100644 index 000000000000..977e00205e6f --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_sysbar_zoom.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar.xml b/packages/SystemUI/res/layout-sw600dp/status_bar.xml index d9f3f2324499..707a8cb56f73 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar.xml @@ -75,6 +75,13 @@ systemui:keyCode="82" android:visibility="invisible" /> + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java new file mode 100644 index 000000000000..9b44f7893cde --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2008 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. + */ + +package com.android.systemui.statusbar.policy; + +import android.app.ActivityManager; +import android.content.Context; +import android.content.res.TypedArray; +import android.os.RemoteException; +import android.util.AttributeSet; +import android.util.Slog; +import android.view.View; +import android.widget.ImageView; + +import com.android.systemui.R; + +public class CompatModeButton extends ImageView implements View.OnClickListener { + private static final String TAG = "StatusBar.CompatModeButton"; + + private ActivityManager mAM; + + public CompatModeButton(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public CompatModeButton(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs); + + setClickable(true); + + mAM = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); + + setOnClickListener(this); + + refresh(); + } + + @Override + public void onClick(View v) { + mAM.setFrontActivityScreenCompatMode(ActivityManager.COMPAT_MODE_TOGGLE); + } + + public void refresh() { + setVisibility( + (mAM.getFrontActivityScreenCompatMode() == ActivityManager.COMPAT_MODE_NEVER) + ? View.GONE + : View.VISIBLE + ); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 1b73e2962737..4e1077091e9d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -69,6 +69,7 @@ import com.android.systemui.R; import com.android.systemui.statusbar.*; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BluetoothController; +import com.android.systemui.statusbar.policy.CompatModeButton; import com.android.systemui.statusbar.policy.LocationController; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.Prefs; @@ -962,6 +963,10 @@ public class TabletStatusBar extends StatusBar implements // See above re: lights-out policy for legacy apps. if (visible) setLightsOn(true); + + // XXX: HACK: not sure if this is the best way to catch a new activity that might require a + // change in compatibility features, but it's a start. + ((CompatModeButton) mBarContents.findViewById(R.id.compat_button)).refresh(); } public void setImeWindowStatus(IBinder token, int vis, int backDisposition) { -- cgit v1.2.3-59-g8ed1b