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

Commit 9d5a6eb4 authored by Michael Kolb's avatar Michael Kolb
Browse files

Match setup wizard wifi settings with new wireframes 

  Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
parent 3a821e86

res/drawable-hdpi/ic_menu_add.png

+133 B (667 B)
Loading image diff...

res/drawable-mdpi/ic_menu_add.png

+120 B (596 B)
Loading image diff...

res/drawable-xhdpi/ic_menu_add.png

+151 B (761 B)
Loading image diff...

res/layout/setup_preference.xml

+43 −12
Original line number Diff line number Diff line
@@ -46,23 +46,13 @@ 
                android:gravity="bottom" />



            <ImageButton

                android:id="@+id/add_network"

                android:layout_width="@dimen/setup_button_size"

                android:layout_height="@dimen/setup_button_size"

                android:layout_marginLeft="8dip"

                android:layout_marginBottom="8dip"

                android:src="@drawable/ic_menu_add"

                android:background="?android:attr/actionBarItemBackground"

                android:contentDescription="@string/wifi_add_network" />



            <ImageButton

                android:id="@+id/wps_push"

                android:id="@+id/more"

                android:layout_width="@dimen/setup_button_size"

                android:layout_height="@dimen/setup_button_size"

                android:layout_marginLeft="8dip"

                android:layout_marginRight="8dip"

                android:layout_marginBottom="8dip"

                android:src="@drawable/ic_wps"

                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"

                android:background="?android:attr/actionBarItemBackground"

                android:contentDescription="@string/wifi_menu_wps_pbc" />
@@ -102,6 +92,47 @@ 
            android:gravity="center"

            android:visibility="gone" />



        <ImageView

            android:id="@+id/divider"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/setup_item_margin"

            android:background="@*android:drawable/list_divider_holo_dark" />



        <LinearLayout

            android:id="@+id/other_network"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/setup_item_margin"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center_vertical"

            android:minHeight="?android:attr/listPreferredItemHeight"

            android:paddingRight="?android:attr/scrollbarSize" >



            <ImageView

                android:id="@+id/add_icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:src="@drawable/ic_menu_add" />



            <TextView

                android:id="@+id/other"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="6dip"

                android:layout_marginLeft="15dip"

                android:layout_marginRight="6dip"

                android:layout_marginTop="6dip"

                android:layout_weight="1"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                android:singleLine="true"

                android:textAppearance="?android:attr/textAppearanceMedium"

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



        </LinearLayout>



        <RelativeLayout

            android:id="@+id/button_bar"

            android:layout_width="match_parent"

res/menu/wifi_setup.xml

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

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

-->



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

    <item

        android:id="@+id/wifi_wps"

        android:title="@string/wifi_setup_wps" />

</menu>