Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d89c35c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev... 

Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am: eff51d56" into pi-dev-plus-aosp
parents ee86dc27 4fe7e636

core/res/res/values/config.xml

+11 −12
Original line number Diff line number Diff line
@@ -30,33 +30,32 @@ 
        <item><xliff:g id="id">@string/status_bar_rotate</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_headset</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_data_saver</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_ime</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_sync_failing</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_sync_active</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cast</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_location</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_bluetooth</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_nfc</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_tty</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_speakerphone</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_zen</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_mute</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_volume</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cdma_eri</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_data_connection</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_phone_evdo_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_phone_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_secure</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_alarm_clock</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_bluetooth</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cast</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_vpn</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_location</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_hotspot</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_ethernet</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_wifi</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_cdma_eri</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_data_connection</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_phone_evdo_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_phone_signal</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_alarm_clock</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_secure</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_clock</xliff:g></item>

    </string-array>



    <string translatable="false" name="status_bar_rotate">rotate</string>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -2732,6 +2732,10 @@ 
  <java-symbol type="string" name="status_bar_alarm_clock" />

  <java-symbol type="string" name="status_bar_secure" />

  <java-symbol type="string" name="status_bar_clock" />

  <java-symbol type="string" name="status_bar_airplane" />

  <java-symbol type="string" name="status_bar_mobile" />

  <java-symbol type="string" name="status_bar_ethernet" />

  <java-symbol type="string" name="status_bar_vpn" />



  <!-- Locale picker -->

  <java-symbol type="id" name="locale_search_menu" />

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+1 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_marginTop="8dp"

    android:layout_marginBottom="14dp"

    android:layout_below="@id/quick_status_bar_system_icons"

    >

    android:paddingEnd="@dimen/signal_cluster_battery_padding" >



    <com.android.systemui.statusbar.phone.StatusIconContainer

        android:id="@+id/statusIcons"
@@ -29,9 +29,4 @@ 
        android:layout_height="match_parent"

        android:layout_weight="1" />



    <include layout="@layout/signal_cluster_view"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_marginStart="@dimen/signal_cluster_margin_start" />



</LinearLayout>

packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml

0 → 100644
+81 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2018, 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.

*/

-->

<com.android.systemui.statusbar.StatusBarMobileView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/mobile_combo"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center_vertical"

    android:orientation="horizontal">

    <FrameLayout

        android:id="@+id/inout_container"

        android:layout_height="17dp"

        android:layout_width="wrap_content"

        android:layout_gravity="center_vertical">

        <ImageView

            android:id="@+id/mobile_in"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:src="@drawable/ic_activity_down"

            android:visibility="gone"

            android:paddingEnd="2dp"

        />

        <ImageView

            android:id="@+id/mobile_out"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:src="@drawable/ic_activity_up"

            android:paddingEnd="2dp"

            android:visibility="gone"

        />

    </FrameLayout>

    <ImageView

        android:id="@+id/mobile_type"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_gravity="center_vertical"

        android:paddingEnd="1dp"

        android:visibility="gone" />

    <Space

        android:id="@+id/mobile_roaming_space"

        android:layout_height="match_parent"

        android:layout_width="@dimen/roaming_icon_start_padding"

        android:visibility="gone"

    />

    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical">

        <com.android.systemui.statusbar.AnimatedImageView

            android:id="@+id/mobile_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            systemui:hasOverlappingRendering="false"

        />

        <ImageView

            android:id="@+id/mobile_roaming"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/stat_sys_roaming"

            android:contentDescription="@string/data_connection_roaming"

            android:visibility="gone" />

    </FrameLayout>

</com.android.systemui.statusbar.StatusBarMobileView>

packages/SystemUI/res/layout/status_bar_wifi_group.xml

0 → 100644
+82 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2018, 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.

*/

-->

<com.android.systemui.statusbar.StatusBarWifiView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/wifi_combo"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:paddingStart="4dp"

    android:gravity="center_vertical"

    android:orientation="horizontal" >



    <FrameLayout

            android:id="@+id/inout_container"

            android:layout_height="17dp"

            android:layout_width="wrap_content"

            android:gravity="center_vertical" >

        <ImageView

            android:id="@+id/wifi_in"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:src="@drawable/ic_activity_down"

            android:visibility="gone"

            android:paddingEnd="2dp"

        />

        <ImageView

            android:id="@+id/wifi_out"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:src="@drawable/ic_activity_up"

            android:paddingEnd="2dp"

            android:visibility="gone"

        />

    </FrameLayout>

    <FrameLayout

        android:id="@+id/wifi_combo"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:gravity="center_vertical" >

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:theme="?attr/lightIconTheme"

            android:id="@+id/wifi_signal"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content" />

    </FrameLayout>



    <View

        android:id="@+id/wifi_signal_spacer"

        android:layout_width="@dimen/status_bar_wifi_signal_spacer_width"

        android:layout_height="4dp"

        android:visibility="gone" />



    <!-- Looks like CarStatusBar uses this... -->

    <ViewStub

        android:id="@+id/connected_device_signals_stub"

        android:layout="@layout/connected_device_signal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />



    <View

        android:id="@+id/wifi_airplane_spacer"

        android:layout_width="@dimen/status_bar_airplane_spacer_width"

        android:layout_height="4dp"

        android:visibility="gone"

    />

</com.android.systemui.statusbar.StatusBarWifiView>