diff options
author | Jason Monk <jmonk@google.com> | 2014-12-02 16:00:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 16:00:03 +0000 |
commit | 2b618bff2d59cea767fb7ac0caa6036a6085c046 (patch) | |
tree | c67697b3def4d6550272a2803d8bc2eb4e5d5690 /packages/SystemUI/res | |
parent | bfecab14f92067ee6104ab419bd8a4c7dcd5d03e (diff) | |
parent | 613c0555ae85a7b79669a4ea5f756f5bf04ac180 (diff) | |
download | frameworks_base-2b618bff2d59cea767fb7ac0caa6036a6085c046.zip frameworks_base-2b618bff2d59cea767fb7ac0caa6036a6085c046.tar.gz frameworks_base-2b618bff2d59cea767fb7ac0caa6036a6085c046.tar.bz2 |
am 613c0555: am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev
* commit '613c0555ae85a7b79669a4ea5f756f5bf04ac180':
SysUI: Actual MSIM status bar support
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/drawable/stat_sys_no_sims.xml | 25 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/mobile_signal_group.xml | 36 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/signal_cluster_view.xml | 27 | ||||
-rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 3 |
4 files changed, 73 insertions, 18 deletions
diff --git a/packages/SystemUI/res/drawable/stat_sys_no_sims.xml b/packages/SystemUI/res/drawable/stat_sys_no_sims.xml new file mode 100644 index 0000000..8bad226 --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_sys_no_sims.xml @@ -0,0 +1,25 @@ +<!-- +Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="17dp" + android:height="17dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + + <path + android:fillColor="#4DFFFFFF" + android:pathData="M19.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-7.0,0.0L7.7,5.3L19.0,16.7L19.0,5.0zM3.7,3.9L2.4,5.2L5.0,7.8L5.0,19.0c0.0,1.1 0.9,2.0 2.0,2.0l10.0,0.0c0.4,0.0 0.7,-0.1 1.0,-0.3l1.9,1.9l1.3,-1.3L3.7,3.9z"/> +</vector> diff --git a/packages/SystemUI/res/layout/mobile_signal_group.xml b/packages/SystemUI/res/layout/mobile_signal_group.xml new file mode 100644 index 0000000..97697189 --- /dev/null +++ b/packages/SystemUI/res/layout/mobile_signal_group.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* apps/common/assets/default/default/skins/StatusBar.xml +** +** Copyright 2011, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/mobile_combo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + > + <ImageView + android:id="@+id/mobile_signal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + /> + <ImageView + android:id="@+id/mobile_type" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + /> +</FrameLayout> diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index f45aa85..8fbd8f7 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -50,27 +50,18 @@ android:layout_height="4dp" android:visibility="gone" /> - <FrameLayout + <LinearLayout + android:id="@+id/mobile_signal_group" android:layout_height="wrap_content" android:layout_width="wrap_content" > - <FrameLayout - android:id="@+id/mobile_combo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - > - <ImageView - android:id="@+id/mobile_signal" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - /> - <ImageView - android:id="@+id/mobile_type" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - /> - </FrameLayout> - </FrameLayout> + </LinearLayout> + <ImageView + android:id="@+id/no_sims" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/stat_sys_no_sims" + /> <View android:id="@+id/wifi_airplane_spacer" android:layout_width="4dp" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 68a7622..44330e8 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -515,6 +515,9 @@ type icon is wide. --> <dimen name="wide_type_icon_start_padding">2dp</dimen> + <!-- Extra padding between multiple phone signal icons. --> + <dimen name="secondary_telephony_padding">2dp</dimen> + <!-- Extra padding between the mobile data type icon and the strength indicator when the data type icon is wide for the tile in quick settings. --> <dimen name="wide_type_icon_start_padding_qs">3dp</dimen> |