Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes for new QS"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-24 22:58:04 +00:00
committed by Android (Google) Code Review
parent f070b4ef55 b595098185
commit 171a0abae4
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/drawable/ic_qs_data_disabled.xml
View File

@@ -16,8 +16,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="17dp"
android:height="17.0dp"
android:viewportWidth="20.0"
android:viewportHeight="20.0">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19.0,6.41L17.59,5.0 12.0,10.59 6.41,5.0 5.0,6.41 10.59,12.0 5.0,17.59 6.41,19.0 12.0,13.41 17.59,19.0 19.0,17.59 13.41,12.0z"/>

5
packages/SystemUI/res/drawable/stat_sys_data_disabled.xml
View File

@@ -14,9 +14,10 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="8.5dp"
android:autoMirrored="true"
android:width="17.0dp"
android:height="17.0dp"
android:viewportWidth="20.0"
android:viewportWidth="40.0"
android:viewportHeight="40.0">
<path
android:fillColor="#FFFFFFFF"

2
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
View File

@@ -148,7 +148,7 @@
android:layout_alignParentTop="true"
android:focusable="true"
android:gravity="center_vertical"
android:paddingEnd="16dp"
android:paddingStart="16dp"
android:paddingTop="6dp"
android:singleLine="true"
android:text="@*android:string/emergency_calls_only"

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -3583,7 +3583,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void postQSRunnableDismissingKeyguard(final Runnable runnable) {
mHandler.post(() -> {
mLeaveOpenOnKeyguardHide = true;
executeRunnableDismissingKeyguard(runnable, null, false, false, false);
executeRunnableDismissingKeyguard(() -> mHandler.post(runnable), null, false, false,
false);
});
}

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -157,7 +157,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
// Set the light/dark theming on the header status UI to match the current theme.
SignalClusterView cluster = (SignalClusterView) findViewById(R.id.signal_cluster);
int colorForeground = Utils.getColorAttr(getContext(), android.R.attr.colorForeground);
float intensity = colorForeground / (float) Color.WHITE;
float intensity = colorForeground == Color.WHITE ? 0 : 1;
cluster.setIconTint(colorForeground, intensity, new Rect(0, 0, 0, 0));
BatteryMeterView battery = (BatteryMeterView) findViewById(R.id.battery);
int colorSecondary = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary);

9
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -799,6 +799,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
MobileSignalController controller = mMobileSignalControllers
.values().toArray(new MobileSignalController[0])[slot];
controller.getState().dataSim = datatype != null;
controller.getState().isDefault = datatype != null;
controller.getState().dataConnected = datatype != null;
if (datatype != null) {
controller.getState().iconGroup =
datatype.equals("1x") ? TelephonyIcons.ONE_X :
@@ -811,6 +813,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
datatype.equals("lte") ? TelephonyIcons.LTE :
datatype.equals("lte+") ? TelephonyIcons.LTE_PLUS :
datatype.equals("roam") ? TelephonyIcons.ROAMING :
datatype.equals("dis") ? TelephonyIcons.DATA_DISABLED :
TelephonyIcons.UNKNOWN;
}
int[][] icons = TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH;
@@ -836,9 +839,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
private SubscriptionInfo addSignalController(int id, int simSlotIndex) {
SubscriptionInfo info = new SubscriptionInfo(id, "", simSlotIndex, "", "", 0, 0, "", 0,
null, 0, 0, "");
mMobileSignalControllers.put(id, new MobileSignalController(mContext,
MobileSignalController controller = new MobileSignalController(mContext,
mConfig, mHasMobileDataFeature, mPhone, mCallbackHandler, this, info,
mSubDefaults, mReceiverHandler.getLooper()));
mSubDefaults, mReceiverHandler.getLooper());
mMobileSignalControllers.put(id, controller);
controller.getState().userSetup = true;
return info;
}

2
packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
View File

@@ -224,7 +224,7 @@ class TelephonyIcons {
static final int ICON_CARRIER_NETWORK_CHANGE =
R.drawable.stat_sys_signal_carrier_network_change_animation;
static final int ICON_DATA_DISABLED = R.drawable.ic_qs_data_disabled;
static final int ICON_DATA_DISABLED = R.drawable.stat_sys_data_disabled;
static final int QS_ICON_LTE = R.drawable.ic_qs_signal_lte;
static final int QS_ICON_3G = R.drawable.ic_qs_signal_3g;