####Fixes for Multi-SIM devices
- The path of the patch is mentioned in the file name of the patch
- Patches can be merged using "git am filename.patch"
From 2a256b88ab2750dd7c76b7b5b59bdfadf062b549 Mon Sep 17 00:00:00 2001 | |
From: Shubhang Rathore <[email protected]> | |
Date: Tue, 23 Dec 2014 12:10:57 -0500 | |
Subject: [PATCH 1/3] base: fix NetworkTraffic indicator for MSIM devices | |
On MSIM devices, upon activating dual SIM, SystemUI | |
throws NPE and crashes constantly at boot. | |
Change-Id: I669ac7697ef02243f01af76d260c0d4592cef5b2 | |
--- | |
packages/SystemUI/res/layout/msim_status_bar.xml | 8 ++++++++ | |
1 file changed, 8 insertions(+) | |
diff --git a/packages/SystemUI/res/layout/msim_status_bar.xml b/packages/SystemUI/res/layout/msim_status_bar.xml | |
index dc49d99..7d893b0 100644 | |
--- a/packages/SystemUI/res/layout/msim_status_bar.xml | |
+++ b/packages/SystemUI/res/layout/msim_status_bar.xml | |
@@ -85,6 +85,14 @@ | |
android:orientation="horizontal" | |
> | |
+ <com.android.systemui.statusbar.policy.NetworkTraffic | |
+ android:id="@+id/networkTraffic" | |
+ android:layout_width="wrap_content" | |
+ android:layout_height="match_parent" | |
+ android:textAppearance="@style/TextAppearance.StatusBar.Traffic" | |
+ android:singleLine="false" | |
+ android:gravity="right|center_vertical"/> | |
+ | |
<include layout="@layout/msim_system_icons" /> | |
<com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text" | |
-- | |
2.1.0 | |
From 8459f18936fd75ae09eba82f11aa2863951c9c8e Mon Sep 17 00:00:00 2001 | |
From: Shubhang Rathore <[email protected]> | |
Date: Wed, 24 Dec 2014 22:58:13 -0500 | |
Subject: [PATCH 2/3] SystemUI: fix style of battery level text for MSIM | |
devices | |
Sync the style with status_bar.xml used for single SIM devices | |
Change-Id: Iaabdc1b342e93ae280b2df2e0e72b796b53647f5 | |
--- | |
packages/SystemUI/res/layout/msim_status_bar.xml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/packages/SystemUI/res/layout/msim_status_bar.xml b/packages/SystemUI/res/layout/msim_status_bar.xml | |
index 7d893b0..5a91aa2 100644 | |
--- a/packages/SystemUI/res/layout/msim_status_bar.xml | |
+++ b/packages/SystemUI/res/layout/msim_status_bar.xml | |
@@ -100,6 +100,7 @@ | |
android:layout_height="wrap_content" | |
android:layout_gravity="center_vertical" | |
android:layout_marginStart="@dimen/header_battery_margin_keyguard" | |
+ android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" | |
android:textColor="#ffffff" | |
android:visibility="gone" | |
android:textSize="@dimen/battery_level_text_size" /> | |
-- | |
2.1.0 | |
From 06dbe59e934d8f9b4801dd474d2069c35af158f6 Mon Sep 17 00:00:00 2001 | |
From: Shubhang Rathore <[email protected]> | |
Date: Wed, 24 Dec 2014 23:05:12 -0500 | |
Subject: [PATCH 3/3] SystemUI: fix Center Clock for MSIM devices | |
On MSIM devices, upon activating dual SIM, SystemUI | |
throws NPE and crashes constantly at boot. | |
Change-Id: I7c4733abb44e6745b5aecb5f2b336caf2ce0393c | |
--- | |
packages/SystemUI/res/layout/msim_status_bar.xml | 19 +++++++++++++++++++ | |
1 file changed, 19 insertions(+) | |
diff --git a/packages/SystemUI/res/layout/msim_status_bar.xml b/packages/SystemUI/res/layout/msim_status_bar.xml | |
index 5a91aa2..2250586 100644 | |
--- a/packages/SystemUI/res/layout/msim_status_bar.xml | |
+++ b/packages/SystemUI/res/layout/msim_status_bar.xml | |
@@ -117,6 +117,25 @@ | |
</com.android.keyguard.AlphaOptimizedLinearLayout> | |
</LinearLayout> | |
+ <com.android.keyguard.AlphaOptimizedLinearLayout | |
+ android:id="@+id/center_clock_layout" | |
+ android:gravity="center" | |
+ android:orientation="horizontal" | |
+ android:layout_width="match_parent" | |
+ android:layout_height="match_parent" | |
+ > | |
+ | |
+ <com.android.systemui.statusbar.policy.ClockCenter | |
+ android:id="@+id/center_clock" | |
+ android:textAppearance="@style/TextAppearance.StatusBar.Clock" | |
+ android:gravity="center" | |
+ android:layout_width="wrap_content" | |
+ android:layout_height="match_parent" | |
+ android:visibility="gone" | |
+ android:singleLine="true" | |
+ /> | |
+ </com.android.keyguard.AlphaOptimizedLinearLayout> | |
+ | |
<ViewStub | |
android:id="@+id/ticker_stub" | |
android:inflatedId="@+id/ticker" | |
-- | |
2.1.0 | |