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

Commit d3669928 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Add Wifi Setup screen for Setup Wizard with XL size screen. 

* Add WifiSettingsForSetupWizardXL as a new Activity
The activity has WifiSettings fragment in it. It also contains
several buttons, texts around the fragment.

* Making configuration UI part of Preference list.
In Wifi Setup for Setup Wizard XL, WifiSettings fragment lets
a UI for configuring access points shown inside a
PregerenceCategory object, while it has been shown as Dialog.

To achieve this action, WifiDialog is decomposed into two parts:
- WifiConfigUiBase (Mainly UI part)
- WifiConfigController (Mainly Wifi controller part)

All codes for wifi configuration in WifiDialog is now in
WifiConfigController, which is reused from
WifiConfigPreference.

* Misc stuff
- Remove AccessPoint#compareTo(). Instead,
  AccessPoint.AccessPointComparater should be used when needed.

Change-Id: I520d690d3301837d32f91dad54a973a379ce1989
parent 0b4dc9fd

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ 
            </intent-filter>

        </activity-alias>



        <activity android:name=".wifi.WifiSettingsForSetupWizardXL"

                  android:clearTaskOnLaunch="true"

                  android:screenOrientation="landscape"

                  android:exported="true" />



        <activity android:name=".wifi.AdvancedSettings"

                android:label="@string/wifi_ip_settings_titlebar"

                >

res/layout-xlarge/access_point_category_for_setup_wizard_xl.xml

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

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

-->



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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

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



    <LinearLayout android:id="@+android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:orientation="vertical" />



</LinearLayout>

res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml

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

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

-->

<LinearLayout

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

   android:orientation="horizontal"

   android:layout_width="fill_parent"

   android:layout_height="fill_parent"

   android:paddingTop="70dip"

   android:paddingBottom="80dip"

   android:paddingLeft="60dip"

   android:paddingRight="60dip">





  <!-- Left: almost empty with one title at the top  -->

  <RelativeLayout

     android:orientation="vertical"

     android:layout_width="0px"

     android:layout_weight=".3"

     android:layout_height="fill_parent"

     android:paddingRight="10dip"

     android:paddingBottom="10dip">

    <TextView

       android:id="@+id/wifi_setup_title"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:gravity="center|top"

       android:textSize="48dip"

       android:textColor="#FF30FF30"

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

    <Button

       android:id="@+id/wifi_setup_cancel"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_alignParentBottom="true"

       android:textSize="24dip"

       android:text="@string/wifi_cancel"

       android:visibility="gone" />

  </RelativeLayout>



  <!-- Center: Full of fragment -->

  <LinearLayout

     android:orientation="vertical"

     android:layout_width="0px"

     android:layout_weight=".4"

     android:layout_height="fill_parent"

     android:paddingTop="20dip"

     android:paddingLeft="10dip"

     android:paddingRight="30dip"

     android:paddingBottom="15dip">

    <!-- Assume the text size of this text should be same as Preference's

         texts. See also preference.xml -->

    <TextView

       android:id="@+id/wifi_setup_status"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:background="#ff113344"

       android:paddingLeft="5dip"

       android:paddingTop="5dip"

       android:paddingBottom="5dip"

       android:layout_marginBottom="20dip"

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

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

    <fragment

       class="com.android.settings.wifi.WifiSettings"

       android:id="@+id/wifi_setup_fragment"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content" />

  </LinearLayout>



  <!-- Right: various information -->

  <RelativeLayout

     android:orientation="vertical"

     android:layout_width="0px"

     android:layout_weight=".3"

     android:layout_height="fill_parent"

     android:paddingTop="22dip"

     android:paddingLeft="30dip"

     android:paddingBottom="10dip">

    <TextView

       android:id="@+id/scanning_progress_text"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_alignParentTop="true"

       android:textSize="24dip"

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

    <ProgressBar

       android:id="@+id/scanning_progress_bar"

       android:layout_width="100dip"

       android:layout_height="wrap_content"

       android:layout_below="@id/scanning_progress_text"

       style="?android:attr/progressBarStyleHorizontal" />



    <Button

       android:id="@+id/wifi_setup_connect"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_alignParentBottom="true"

       android:textSize="24dip"

       android:text="@string/wifi_connect"

       android:visibility="gone" />

    <Button

       android:id="@+id/wifi_setup_forget"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_alignParentBottom="true"

       android:textSize="24dip"

       android:text="@string/wifi_forget"

       android:visibility="gone" />



    <Button

       android:id="@+id/wifi_setup_skip_or_next"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_marginTop="30dip"

       android:layout_alignParentBottom="true"

       android:textSize="24dip"

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



    <Button

       android:id="@+id/wifi_setup_refresh_list"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_above="@id/wifi_setup_skip_or_next"

       android:textSize="24dip"

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



    <Button

       android:id="@+id/wifi_setup_add_network"

       android:layout_width="fill_parent"

       android:layout_height="wrap_content"

       android:layout_above="@id/wifi_setup_refresh_list"

       android:textSize="24dip"

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



  </RelativeLayout>

</LinearLayout>

res/layout/wifi_config_preference.xml

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

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

-->

<!-- All ids in this layout must be in wifi_dialog.xml -->

<LinearLayout

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

   android:orientation="vertical"

   android:layout_width="fill_parent"

   android:layout_height="fill_parent">

  <!-- <TextView android:id="@+id/title"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:text="@string/title" /> -->



  <LinearLayout android:id="@+id/info"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical" />



  <LinearLayout android:id="@+id/type"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone">



    <TextView android:layout_width="fill_parent"

              android:layout_height="wrap_content"

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



    <EditText android:id="@+id/ssid"

              android:layout_width="fill_parent"

              android:layout_height="wrap_content"

              android:singleLine="true"

              android:inputType="textNoSuggestions" />



    <TextView android:layout_width="fill_parent"

              android:layout_height="wrap_content"

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



    <Spinner android:id="@+id/security"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

             android:prompt="@string/wifi_security"

             android:entries="@array/wifi_security" />

  </LinearLayout>  <!-- android:id="@+id/type" -->



  <LinearLayout android:id="@+id/fields"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone">



    <LinearLayout android:id="@+id/eap"

                  android:layout_width="fill_parent"

                  android:layout_height="wrap_content"

                  android:orientation="vertical"

                  android:visibility="gone">



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <Spinner android:id="@+id/method"

               android:layout_width="fill_parent"

               android:layout_height="wrap_content"

               android:prompt="@string/wifi_eap_method"

               android:entries="@array/wifi_eap_method" />



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <Spinner android:id="@+id/phase2"

               android:layout_width="fill_parent"

               android:layout_height="wrap_content"

               android:prompt="@string/please_select_phase2"

               android:entries="@array/wifi_phase2_entries" />



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <Spinner android:id="@+id/ca_cert"

               android:layout_width="fill_parent"

               android:layout_height="wrap_content"

               android:prompt="@string/wifi_eap_ca_cert" />



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <Spinner android:id="@+id/user_cert"

               android:layout_width="fill_parent"

               android:layout_height="wrap_content"

               android:prompt="@string/wifi_eap_user_cert" />



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <EditText android:id="@+id/identity"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:inputType="textNoSuggestions" />



      <TextView

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

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



      <EditText android:id="@+id/anonymous"

                android:layout_width="fill_parent"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:inputType="textNoSuggestions" />

    </LinearLayout> <!-- android:id="@+id/eap" -->



    <TextView android:layout_width="fill_parent"

              android:layout_height="wrap_content"

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



    <EditText android:id="@+id/password"

              android:layout_width="fill_parent"

              android:layout_height="wrap_content"

              android:singleLine="true"

              android:password="true" />



    <CheckBox android:id="@+id/show_password"

              android:layout_width="fill_parent"

              android:layout_height="wrap_content"

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

  </LinearLayout>  <!-- android:id="@+id/fields" -->

</LinearLayout>

res/values/strings.xml

+38 −0
Original line number Diff line number Diff line
@@ -2644,4 +2644,42 @@ found in the list of installed applications.</string> 
    <string name="sound_category_calls_title">Incoming calls</string>

    <string name="sound_category_notification_title">Notifications</string>

    <string name="sound_category_feedback_title">Feedback</string>



    <!-- Wifi Setup For Setup Wizard with XL screen -->

    <!-- Title shown in Wifi Setup For Setup Wizard with XL screen -->

    <string name="wifi_setup_title">WiFi setup</string>

    <!-- Text message shown when Wifi is not connected.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_not_connected">Not connected</string>

    <!-- Button message shown on the button adding manual setting.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_add_network">Add network</string>

    <!-- Button message shown on the button refreshing a list of network.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_refresh_list">Refresh list</string>

    <!-- Button message shown on the button enabling users skip Wifi Setup.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_skip">Skip</string>

    <!-- Button message shown on the button enabling users go the next step.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_next">Next</string>



    <!-- Message shown above available network when there's no connected network.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_status_select_network">Touch to select network</string>

    <!-- Message shown above available networks when a user clicked one of available

         networks and the UI is showing one possible existing network.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_status_existing_network">Connect to existing network</string>

    <!-- The message shown above available networks when a user clicked "Add network"

         button. Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_status_new_network">Connect to new network</string>

    <!-- The message shown above available networks when a user clicked one of available

         networks or created another profile and he/she is waiting for the connection

         is established.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_status_connecting">Connecting...</string>

    <!-- The message show above available networks when connection is established.

         Used in Wifi Setup For Setup Wizard with XL screen. -->

    <string name="wifi_setup_status_connected">Connected</string>

</resources>