diff options
Diffstat (limited to 'packages')
23 files changed, 61 insertions, 33 deletions
diff --git a/packages/InputDevices/AndroidManifest.xml b/packages/InputDevices/AndroidManifest.xml index 6831a74..f0e4abc 100644 --- a/packages/InputDevices/AndroidManifest.xml +++ b/packages/InputDevices/AndroidManifest.xml @@ -8,7 +8,8 @@ android:label="@string/app_label" android:process="system"> - <receiver android:name=".InputDeviceReceiver"> + <receiver android:name=".InputDeviceReceiver" + android:label="@string/keyboard_layouts_label"> <intent-filter> <action android:name="android.hardware.input.action.QUERY_KEYBOARD_LAYOUTS" /> </intent-filter> diff --git a/packages/InputDevices/res/values/strings.xml b/packages/InputDevices/res/values/strings.xml index 140c7d4..c13e606 100644 --- a/packages/InputDevices/res/values/strings.xml +++ b/packages/InputDevices/res/values/strings.xml @@ -3,6 +3,9 @@ <!-- Name of the application. [CHAR LIMIT=35] --> <string name="app_label">Input Devices</string> + <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] --> + <string name="keyboard_layouts_label">Android keyboard</string> + <!-- US English keyboard layout label. [CHAR LIMIT=35] --> <string name="keyboard_layout_english_us_label">English (US)</string> diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png Binary files differindex daf18c7..d9ec745 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..117cf19 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png Binary files differindex 5292998..2cebe85 100644 --- a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..7c60bea --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png Binary files differnew file mode 100644 index 0000000..9e6323c --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..09b35b3 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png Binary files differnew file mode 100644 index 0000000..2220c73 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..ea987f1 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png Binary files differnew file mode 100644 index 0000000..21db6a2 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..5e8baa4 --- /dev/null +++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png Binary files differindex 3e7fefd..90b8c84 100644 --- a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png Binary files differnew file mode 100644 index 0000000..5881402 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png diff --git a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml index b9af3a9..f93dd33 100644 --- a/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/super_status_bar.xml @@ -26,15 +26,16 @@ android:fitsSystemWindows="true" > + <include layout="@layout/status_bar" + android:layout_width="match_parent" + android:layout_height="@*android:dimen/status_bar_height" + /> + <include layout="@layout/status_bar_expanded" android:layout_width="@dimen/notification_panel_width" android:layout_height="match_parent" android:layout_gravity="center_horizontal|top" - /> - - <include layout="@layout/status_bar" - android:layout_width="match_parent" - android:layout_height="@*android:dimen/status_bar_height" + android:visibility="invisible" /> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 6c31ff4..b85686f 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -26,14 +26,15 @@ android:fitsSystemWindows="true" > - <include layout="@layout/status_bar_expanded" + <include layout="@layout/status_bar" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="@*android:dimen/status_bar_height" /> - <include layout="@layout/status_bar" + <include layout="@layout/status_bar_expanded" android:layout_width="match_parent" - android:layout_height="@*android:dimen/status_bar_height" + android:layout_height="match_parent" + android:visibility="invisible" /> </com.android.systemui.statusbar.phone.StatusBarWindowView> diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml index 07d55f1..be59075 100644 --- a/packages/SystemUI/res/values-sw600dp/dimens.xml +++ b/packages/SystemUI/res/values-sw600dp/dimens.xml @@ -33,9 +33,6 @@ <!-- Height of search panel including navigation bar height --> <dimen name="navbar_search_panel_height">300dip</dimen> - <!-- Extra space above the clock in the panel; on this device, zero --> - <dimen name="notification_panel_header_padding_top">0dp</dimen> - <!-- Size of application thumbnail --> <dimen name="status_bar_recents_thumbnail_width">200dp</dimen> <dimen name="status_bar_recents_thumbnail_height">177dp</dimen> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 0d79a9b..b1611d1 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -132,10 +132,10 @@ <!-- Height of the notification panel header bar --> <dimen name="notification_panel_header_height">48dp</dimen> - <!-- Height of the notification panel header bar --> - <dimen name="notification_panel_padding_top">@*android:dimen/status_bar_height</dimen> + <!-- Extra space above the panel --> + <dimen name="notification_panel_padding_top">4dp</dimen> - <!-- Extra space above the clock in the panel; half of (notification_panel_header_height - 32) --> + <!-- Extra space above the clock in the panel --> <dimen name="notification_panel_header_padding_top">0dp</dimen> <!-- Layout parameters for the notification panel --> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index af77a30..a23fe12 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -59,7 +59,7 @@ <style name="TextAppearance.StatusBar.Expanded.Date"> <item name="android:textSize">12dp</item> <item name="android:textStyle">normal</item> - <item name="android:textColor">#666666</item> + <item name="android:textColor">#cccccc</item> <item name="android:textAllCaps">true</item> </style> diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index c60c806..96f83c6 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -281,9 +281,16 @@ public class ImageWallpaper extends WallpaperService { return; } - if (mBackgroundWidth < 0 || mBackgroundHeight < 0) { - // If we don't yet know the size of the wallpaper bitmap, - // we need to get it now. + // If we don't yet know the size of the wallpaper bitmap, + // we need to get it now. + boolean updateWallpaper = mBackgroundWidth < 0 || mBackgroundHeight < 0 ; + + // If we somehow got to this point after we have last flushed + // the wallpaper, well we really need it to draw again. So + // seems like we need to reload it. Ouch. + updateWallpaper = updateWallpaper || mBackground == null; + + if (updateWallpaper) { updateWallpaperLocked(); } @@ -308,12 +315,6 @@ public class ImageWallpaper extends WallpaperService { mLastXTranslation = xPixels; mLastYTranslation = yPixels; - if (mBackground == null) { - // If we somehow got to this point after we have last flushed - // the wallpaper, well we really need it to draw again. So - // seems like we need to reload it. Ouch. - updateWallpaperLocked(); - } if (mIsHwAccelerated) { if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 2f02d23..1321ade 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -21,9 +21,9 @@ import android.util.AttributeSet; import android.util.Slog; import android.view.View; import android.view.ViewGroup; +import android.view.accessibility.AccessibilityEvent; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.TextView; import com.android.systemui.statusbar.policy.NetworkController; @@ -31,12 +31,12 @@ import com.android.systemui.R; // Intimately tied to the design of res/layout/signal_cluster_view.xml public class SignalClusterView - extends LinearLayout + extends LinearLayout implements NetworkController.SignalCluster { static final boolean DEBUG = false; static final String TAG = "SignalClusterView"; - + NetworkController mNC; private boolean mWifiVisible = false; @@ -132,6 +132,17 @@ public class SignalClusterView apply(); } + @Override + public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { + // Standard group layout onPopulateAccessibilityEvent() implementations + // ignore content description, so populate manually + if (mWifiVisible && mWifiGroup.getContentDescription() != null) + event.getText().add(mWifiGroup.getContentDescription()); + if (mMobileVisible && mMobileGroup.getContentDescription() != null) + event.getText().add(mMobileGroup.getContentDescription()); + return super.dispatchPopulateAccessibilityEvent(event); + } + // Run after each indicator change. private void apply() { if (mWifiGroup == null) return; 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 4e6857e..69d2e73 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -301,6 +301,9 @@ public class PhoneStatusBar extends BaseStatusBar { return true; } }); + mNotificationPanel.setSystemUiVisibility( + View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER + | View.STATUS_BAR_DISABLE_SYSTEM_INFO); if (!ActivityManager.isHighEndGfx(mDisplay)) { mStatusBarWindow.setBackground(null); @@ -336,7 +339,6 @@ public class PhoneStatusBar extends BaseStatusBar { mPixelFormat = PixelFormat.OPAQUE; mStatusIcons = (LinearLayout)mStatusBarView.findViewById(R.id.statusIcons); mNotificationIcons = (IconMerger)mStatusBarView.findViewById(R.id.notificationIcons); - mMoreIcon = mStatusBarView.findViewById(R.id.moreIcon); mNotificationIcons.setOverflowIndicator(mMoreIcon); mIcons = (LinearLayout)mStatusBarView.findViewById(R.id.icons); mTickerView = mStatusBarView.findViewById(R.id.ticker); @@ -884,6 +886,15 @@ public class PhoneStatusBar extends BaseStatusBar { flagdbg.append(((diff & StatusBarManager.DISABLE_CLOCK) != 0) ? "* " : " "); flagdbg.append(">"); Slog.d(TAG, flagdbg.toString()); + + if ((diff & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) { + mIcons.animate().cancel(); + if ((state & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) { + mIcons.animate().alpha(0f).setStartDelay(100).setDuration(200).start(); + } else { + mIcons.animate().alpha(1f).setStartDelay(0).setDuration(300).start(); + } + } if ((diff & StatusBarManager.DISABLE_CLOCK) != 0) { boolean show = (state & StatusBarManager.DISABLE_CLOCK) == 0; @@ -985,6 +996,7 @@ public class PhoneStatusBar extends BaseStatusBar { } mExpandedVisible = true; + mNotificationPanel.setVisibility(View.VISIBLE); updateExpandedViewPos(EXPANDED_LEAVE_ALONE); @@ -1078,7 +1090,7 @@ public class PhoneStatusBar extends BaseStatusBar { } mExpandedVisible = false; visibilityChanged(false); - //mNotificationPanel.setVisibility(View.GONE); + mNotificationPanel.setVisibility(View.INVISIBLE); // Shrink the window to the size of the status bar only WindowManager.LayoutParams lp = (WindowManager.LayoutParams) mStatusBarWindow.getLayoutParams(); 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 a05fcc1..c65f581 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -282,7 +282,8 @@ public class NetworkController extends BroadcastReceiver { public void refreshSignalCluster(SignalCluster cluster) { cluster.setWifiIndicators( - mWifiConnected, // only show wifi in the cluster if connected + // only show wifi in the cluster if connected or if wifi-only + mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature), mWifiIconId, mWifiActivityIconId, mContentDescriptionWifi); @@ -786,7 +787,7 @@ public class NetworkController extends BroadcastReceiver { if (mDataAndWifiStacked) { mWifiIconId = 0; } else { - mWifiIconId = mWifiEnabled ? WifiIcons.WIFI_SIGNAL_STRENGTH[0][0] : 0; + mWifiIconId = mWifiEnabled ? R.drawable.stat_sys_wifi_signal_null : 0; } mContentDescriptionWifi = mContext.getString(R.string.accessibility_no_wifi); } |
