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

Commit a8b824d6 authored by Maurice Lam's avatar Maurice Lam
Browse files

[WifiSettings] Use arrows for advanced options 

Use an arrow pointing up / down for advanced options instead of a
checkbox, making it more clear that it is merely hiding the options,
and not a setting in itself that others are dependent upon.

Bug: 18007635
Change-Id: Ie2f2cca708b661f76749bc4af5918275806af1a8
parent a49fd145

res/drawable/ic_expand.xml

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

<!--

     Copyright (C) 2015 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.

-->



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



    <item android:state_checked="true" android:drawable="@drawable/ic_expand_less" />



    <item android:drawable="@drawable/ic_expand_more" />



</selector>

res/drawable/ic_expand_less.xml

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

<!--

     Copyright (C) 2015 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="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:pathData="M12.0,8.0l-6.0,6.0 1.41,1.41L12.0,10.83l4.59,4.58L18.0,14.0z"/>



</vector>

res/drawable/ic_expand_more.xml

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

<!--

     Copyright (C) 2015 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="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>



</vector>

res/layout/wifi_dialog.xml

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ 
            <CheckBox android:id="@+id/wifi_advanced_togglebox"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item_content"

                    android:textSize="14sp"

                    style="@style/wifi_advanced_toggle"

                    android:text="@string/wifi_show_advanced" />

        </LinearLayout>

res/values/styles.xml

+8 −0
Original line number Diff line number Diff line
@@ -245,6 +245,14 @@ 
        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="wifi_advanced_toggle" parent="wifi_item_content">

        <item name="android:background">@null</item>

        <item name="android:button">@null</item>

        <item name="android:drawableEnd">@drawable/ic_expand</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:textSize">14sp</item>

    </style>



    <style name="wifi_item_edit_content">

        <item name="android:paddingStart">4dip</item>

        <item name="android:layout_marginStart">4dip</item>