diff options
28 files changed, 32 insertions, 5 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..1a5a8aa4ab4f --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..cceab0ad0393 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..e377608bac25 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..d619f6b440f9 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..515788ac7f80 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..58327c1fd852 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..66dc6940fabc --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..80784248c750 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..50e5011b92d9 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..bb1de0632be1 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..6de14dca4db7 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..17ca21a77a6a --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..0d344b968800 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..ac010bf381dd --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..b704cdf31bb1 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..3cb8f3e079c1 --- /dev/null +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..d819f5cd742b --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..bb1de0632be1 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..6de14dca4db7 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..17ca21a77a6a --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png Binary files differnew file mode 100644 index 000000000000..75c5c72d5811 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_lte.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png Binary files differnew file mode 100644 index 000000000000..402db439d3de --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_lte.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png Binary files differnew file mode 100644 index 000000000000..7a59975300e2 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_lte.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.png Binary files differnew file mode 100644 index 000000000000..84348add5943 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_lte.png diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index a27630db17fe..4c81c886cb7d 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -102,5 +102,8 @@ <!-- Enable the "flip settings" panel --> <bool name="config_hasFlipSettingsPanel">true</bool> + + <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? --> + <bool name="config_show4GForLTE">false</bool> </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f3db062a04d5..5767e63a0cfd 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -320,6 +320,9 @@ <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_data_connection_4g">4G</string> + <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_data_connection_lte">LTE</string> + <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_data_connection_cdma">CDMA</string> 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 36195871ee4f..da5f767be4c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -90,6 +90,7 @@ public class NetworkController extends BroadcastReceiver { boolean mShowPhoneRSSIForData = false; boolean mShowAtLeastThreeGees = false; boolean mAlwaysShowCdmaRssi = false; + boolean mShow4GforLTE = false; String mContentDescriptionPhoneSignal; String mContentDescriptionWifi; @@ -199,6 +200,7 @@ public class NetworkController extends BroadcastReceiver { mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData); mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G); + mShow4GforLTE = res.getBoolean(R.bool.config_show4GForLTE); mAlwaysShowCdmaRssi = res.getBoolean( com.android.internal.R.bool.config_alwaysUseCdmaRssi); @@ -678,11 +680,19 @@ public class NetworkController extends BroadcastReceiver { R.string.accessibility_data_connection_3g); break; case TelephonyManager.NETWORK_TYPE_LTE: - mDataIconList = TelephonyIcons.DATA_4G[mInetCondition]; - mDataTypeIconId = R.drawable.stat_sys_data_connected_4g; - mQSDataTypeIconId = R.drawable.ic_qs_signal_4g; - mContentDescriptionDataType = mContext.getString( - R.string.accessibility_data_connection_4g); + if (mShow4GforLTE) { + mDataIconList = TelephonyIcons.DATA_4G[mInetCondition]; + mDataTypeIconId = R.drawable.stat_sys_data_connected_4g; + mQSDataTypeIconId = R.drawable.ic_qs_signal_4g; + mContentDescriptionDataType = mContext.getString( + R.string.accessibility_data_connection_4g); + } else { + mDataIconList = TelephonyIcons.DATA_LTE[mInetCondition]; + mDataTypeIconId = R.drawable.stat_sys_data_connected_lte; + mQSDataTypeIconId = R.drawable.ic_qs_signal_lte; + mContentDescriptionDataType = mContext.getString( + R.string.accessibility_data_connection_lte); + } break; default: if (!mShowAtLeastThreeGees) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index 3b953a01aa55..4b2c65e67bc6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -136,6 +136,17 @@ class TelephonyIcons { R.drawable.stat_sys_data_fully_connected_4g } }; + // LTE branded "LTE" + static final int[][] DATA_LTE = { + { R.drawable.stat_sys_data_connected_lte, + R.drawable.stat_sys_data_connected_lte, + R.drawable.stat_sys_data_connected_lte, + R.drawable.stat_sys_data_connected_lte }, + { R.drawable.stat_sys_data_fully_connected_lte, + R.drawable.stat_sys_data_fully_connected_lte, + R.drawable.stat_sys_data_fully_connected_lte, + R.drawable.stat_sys_data_fully_connected_lte } + }; } |
