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

Commit d3eee336 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 

* commit '15a8a153':
  QS Wifi panel show icon on secure networks
parents c34118a7 15a8a153

packages/SystemUI/res/drawable/qs_ic_wifi_lock.xml

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
<!--

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="24.0dp"

    android:height="24.0dp"

    android:viewportWidth="72.0"

    android:viewportHeight="72.0">

    <group

        android:translateX="52.0"

        android:translateY="42.0" >

        <path

            android:fillColor="#FFFFFFFF"

            android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>

    </group>

</vector>

packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -18,13 +18,13 @@ package com.android.systemui.qs; 




import android.content.Context;

import android.content.Context;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.os.Handler;

import android.os.Looper;

import android.os.Looper;

import android.os.Message;

import android.os.Message;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;
@@ -162,6 +162,12 @@ public class QSDetailItems extends FrameLayout { 
        view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE);

        view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE);

        final ImageView iv = (ImageView) view.findViewById(android.R.id.icon);

        final ImageView iv = (ImageView) view.findViewById(android.R.id.icon);

        iv.setImageResource(item.icon);

        iv.setImageResource(item.icon);

        iv.getOverlay().clear();

        if (item.overlay != null) {

            item.overlay.setBounds(0, 0, item.overlay.getIntrinsicWidth(),

                    item.overlay.getIntrinsicHeight());

            iv.getOverlay().add(item.overlay);

        }

        final TextView title = (TextView) view.findViewById(android.R.id.title);

        final TextView title = (TextView) view.findViewById(android.R.id.title);

        title.setText(item.line1);

        title.setText(item.line1);

        final TextView summary = (TextView) view.findViewById(android.R.id.summary);

        final TextView summary = (TextView) view.findViewById(android.R.id.summary);
@@ -213,6 +219,7 @@ public class QSDetailItems extends FrameLayout { 




    public static class Item {

    public static class Item {

        public int icon;

        public int icon;

        public Drawable overlay;

        public String line1;

        public String line1;

        public String line2;

        public String line2;

        public Object tag;

        public Object tag;

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -326,7 +326,12 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
                        item.line2 = mContext.getString(ap.isConfigured ?

                        item.line2 = mContext.getString(ap.isConfigured ?

                                R.string.quick_settings_connected :

                                R.string.quick_settings_connected :

                                R.string.quick_settings_connected_via_wfa);

                                R.string.quick_settings_connected_via_wfa);

                    } else if (ap.networkId >= 0) {

                        // TODO: Set line 2 to wifi saved string here.

                    }

                    }

                    item.overlay = ap.hasSecurity

                            ? mContext.getDrawable(R.drawable.qs_ic_wifi_lock)

                            : null;

                    items[i] = item;

                    items[i] = item;

                }

                }

            }

            }