diff options
Diffstat (limited to 'packages')
24 files changed, 78 insertions, 77 deletions
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index 6e5f856..113f0f7 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -156,6 +156,7 @@ public class DefaultContainerService extends IntentService { } ret.packageName = pkg.packageName; ret.installLocation = pkg.installLocation; + ret.verifiers = pkg.verifiers; ret.recommendedInstallLocation = recommendAppInstallLocation(pkg.installLocation, archiveFilePath, flags, threshold); diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png Binary files differindex 3137e7e..908056f 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_alarm.png Binary files differindex ffffb2d..fc8dee1 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png Binary files differindex 2117705..4a5d001 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_sync.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_sync.png Binary files differindex ba2d78a..ed31e8e 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_sync.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_sync.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_sync_error.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_sync_error.png Binary files differindex 1102846..6583878 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_sync_error.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_sync_error.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png Binary files differindex 5c98614..9820a79 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_alarm.png Binary files differindex 4931b66..4b0a74f 100644 --- a/packages/SystemUI/res/drawable-mdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png Binary files differindex f288d9f..53a7364 100644 --- a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_sync.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_sync.png Binary files differindex 6649031..06b3913 100644 --- a/packages/SystemUI/res/drawable-mdpi/stat_sys_sync.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_sync.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_sync_error.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_sync_error.png Binary files differindex 1b57936..4f23dae 100644 --- a/packages/SystemUI/res/drawable-mdpi/stat_sys_sync_error.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_sync_error.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png Binary files differindex 7c6b8e5..0b41317 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_alarm.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_alarm.png Binary files differindex 6abc7c8..19ad300 100644 --- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_alarm.png +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_alarm.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png Binary files differindex 738bd21..524b31b 100644 --- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_bluetooth.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync.png Binary files differindex fb691fc..fdd640c 100644 --- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync.png +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync_error.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync_error.png Binary files differindex 0c7ba35..a1a0646 100644 --- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync_error.png +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_sync_error.png diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index 492f3c2..bf1ec25 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -26,6 +26,7 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.Region.Op; import android.opengl.GLUtils; +import android.os.SystemProperties; import android.renderscript.Matrix4f; import android.service.wallpaper.WallpaperService; import android.util.Log; @@ -56,6 +57,7 @@ public class ImageWallpaper extends WallpaperService { private static final String TAG = "ImageWallpaper"; private static final String GL_LOG_TAG = "ImageWallpaperGL"; private static final boolean DEBUG = false; + private static final String PROPERTY_KERNEL_QEMU = "ro.kernel.qemu"; static final boolean FIXED_SIZED_SURFACE = true; static final boolean USE_OPENGL = true; @@ -71,12 +73,19 @@ public class ImageWallpaper extends WallpaperService { //noinspection PointlessBooleanExpression,ConstantConditions if (FIXED_SIZED_SURFACE && USE_OPENGL) { - WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE); - Display display = windowManager.getDefaultDisplay(); - mIsHwAccelerated = ActivityManager.isHighEndGfx(display); + if (!isEmulator()) { + WindowManager windowManager = + (WindowManager) getSystemService(Context.WINDOW_SERVICE); + Display display = windowManager.getDefaultDisplay(); + mIsHwAccelerated = ActivityManager.isHighEndGfx(display); + } } } + private static boolean isEmulator() { + return "1".equals(SystemProperties.get(PROPERTY_KERNEL_QEMU, "0")); + } + public Engine onCreateEngine() { return new DrawableEngine(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBar.java index 37c77f6..5959537 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBar.java @@ -118,7 +118,7 @@ public abstract class StatusBar extends SystemUI implements CommandQueue.Callbac WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH, - PixelFormat.RGBX_8888); + PixelFormat.OPAQUE); // the status bar should be in an overlay if possible final Display defaultDisplay diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index a90eb3f..6997837 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -29,6 +29,7 @@ import android.util.Slog; import android.util.Log; import android.view.ViewDebug; import android.view.accessibility.AccessibilityEvent; +import android.widget.ImageView; import java.text.NumberFormat; @@ -70,6 +71,8 @@ public class StatusBarIconView extends AnimatedImageView { final float alpha = res.getFraction(R.dimen.status_bar_icon_drawing_alpha, 1, 1); setAlpha(alpha); } + + setScaleType(ImageView.ScaleType.CENTER); } private static boolean streq(String a, String b) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 25b1bc1..e5d4d22 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -316,12 +316,7 @@ public class PhoneStatusBar extends StatusBar { } // figure out which pixel-format to use for the status bar. - mPixelFormat = PixelFormat.TRANSLUCENT; - Drawable bg = sb.getBackground(); - if (bg != null) { - mPixelFormat = bg.getOpacity(); - } - + mPixelFormat = PixelFormat.OPAQUE; mStatusIcons = (LinearLayout)sb.findViewById(R.id.statusIcons); mNotificationIcons = (IconMerger)sb.findViewById(R.id.notificationIcons); mIcons = (LinearLayout)sb.findViewById(R.id.icons); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 05e171c..9bee5df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -64,6 +64,8 @@ public class PhoneStatusBarPolicy { private static final int INET_CONDITION_THRESHOLD = 50; + private static final boolean SHOW_SYNC_ICON = false; + private final Context mContext; private final StatusBarManager mService; private final Handler mHandler = new Handler(); @@ -195,6 +197,7 @@ public class PhoneStatusBarPolicy { } private final void updateSyncState(Intent intent) { + if (!SHOW_SYNC_ICON) return; boolean isActive = intent.getBooleanExtra("active", false); boolean isFailing = intent.getBooleanExtra("failing", false); mService.setIconVisibility("sync_active", isActive); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 0dfc4f7..c83c470 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -720,28 +720,19 @@ public class NetworkController extends BroadcastReceiver { Slog.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus); } - int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); - - switch (info.getType()) { - case ConnectivityManager.TYPE_MOBILE: - mInetCondition = inetCondition; - updateDataNetType(); - updateDataIcon(); - updateTelephonySignalStrength(); // apply any change in connectionStatus - break; - case ConnectivityManager.TYPE_WIFI: - mInetCondition = inetCondition; - updateWifiIcons(); - break; - case ConnectivityManager.TYPE_BLUETOOTH: - mInetCondition = inetCondition; - if (info != null) { - mBluetoothTethered = info.isConnected() ? true: false; - } else { - mBluetoothTethered = false; - } - break; + mInetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); + + if (info != null && info.getType() == ConnectivityManager.TYPE_BLUETOOTH) { + mBluetoothTethered = info.isConnected() ? true: false; + } else { + mBluetoothTethered = false; } + + // We want to update all the icons, all at once, for any condition change + updateDataNetType(); + updateDataIcon(); + updateTelephonySignalStrength(); + updateWifiIcons(); } @@ -1035,8 +1026,8 @@ public class NetworkController extends BroadcastReceiver { pw.println(mWifiLevel); pw.print(" mWifiSsid="); pw.println(mWifiSsid); - pw.print(" mWifiIconId="); - pw.println(mWifiIconId); + pw.print(String.format(" mWifiIconId=0x%08x/%s", + mWifiIconId, getResourceName(mWifiIconId))); pw.print(" mWifiActivity="); pw.println(mWifiActivity); diff --git a/packages/VpnDialogs/res/layout/confirm.xml b/packages/VpnDialogs/res/layout/confirm.xml index 11a247a..fef00c2 100644 --- a/packages/VpnDialogs/res/layout/confirm.xml +++ b/packages/VpnDialogs/res/layout/confirm.xml @@ -15,46 +15,43 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="3mm"> - - <ImageView android:id="@+id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_marginRight="1mm"/> - - <TextView android:id="@+id/warning" - android:layout_width="fill_parent" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@id/icon" - android:padding="3mm" - android:text="@string/warning" - android:textSize="18sp"/> - - <TextView android:id="@+id/prompt" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_toRightOf="@id/icon" - android:layout_above="@id/warning" - android:gravity="center_vertical" - android:textSize="20sp"/> - - <CheckBox android:id="@+id/check" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@id/warning" - android:text="@string/accept" - android:textSize="20sp" - android:checked="false"/> - -</RelativeLayout> + android:orientation="vertical" + android:padding="3mm"> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical"> + + <ImageView android:id="@+id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:paddingRight="1mm"/> + + <TextView android:id="@+id/prompt" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textSize="18sp"/> + </LinearLayout> + + <TextView android:id="@+id/warning" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="1mm" + android:paddingBottom="1mm" + android:text="@string/warning" + android:textSize="18sp"/> + + <CheckBox android:id="@+id/check" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/accept" + android:textSize="20sp" + android:checked="false"/> + </LinearLayout> +</ScrollView> diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index d668e98..7fb1417 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -181,8 +181,10 @@ public class ManageDialog extends Activity implements Handler.Callback, String line = in.readLine().trim(); if (line.startsWith(prefix)) { String[] numbers = line.substring(prefix.length()).split(" +"); - if (numbers.length == 17) { - return numbers; + for (int i = 1; i < 17; ++i) { + if (!numbers[i].equals("0")) { + return numbers; + } } break; } |
