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

Commit 66c99aea authored by Natiq Ahmed's avatar Natiq Ahmed
Browse files

Fix compilation issues

Conflicts:
	src/com/android/settings/wifi/AdvancedWifiSettings.java
Change-Id: Ibeb4c715d0be2c66b0b0951a7eb7786cc1f9c6e9
parent 39e938cf
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -115,6 +115,26 @@

        </LinearLayout>

        <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical">

            <TextView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/sim_dialog_margin_top"
                    android:text="@string/sim_editor_num_format" />

            <Spinner android:id="@+id/display_numbers"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:entries="@array/sim_card_data_range"
                    android:paddingBottom="@dimen/sim_dialog_margin_bottom"
                    android:prompt="@string/sim_editor_num_format" />

        </LinearLayout>

    </LinearLayout>

</ScrollView>
+0 −81
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/wifi_assistant_card"
    android:background="@android:color/transparent"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:gravity="center_vertical"
    android:orientation="vertical">

    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="fill_parent"
        android:layout_height="@dimen/wifi_assistant_height">

        <ImageView
            android:id="@+id/cardBackground"
            android:background="@color/wifi_assistant_color_accent"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:src="@drawable/wifi_assistant_card" />

        <TextView
            android:id="@+id/backgroundText"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/wifi_assistant_text_padding"
            android:gravity="start"
            android:paddingStart="@dimen/wifi_assistant_padding_start_end"
            android:paddingTop="@dimen/wifi_assistant_padding_top_bottom"
            android:text="@string/wifi_assistant_intro_setup"
            style="@style/WifiAssistantText" />

    </RelativeLayout>

    <TextView
        android:id="@+id/wifi_assistant_text"
        android:background="@android:color/transparent"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:layout_marginBottom="@dimen/wifi_assistant_padding_top_bottom"
        android:layout_marginTop="@dimen/wifi_assistant_padding_top_bottom"
        android:layout_marginStart="@dimen/wifi_assistant_padding_start_end"
        android:layout_marginEnd="@dimen/wifi_assistant_padding_start_end"
        android:gravity="start"
        android:textAppearance="?android:attr/textAppearanceMedium" />

    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
        android:background="@android:color/transparent"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
        android:gravity="end"
        android:orientation="horizontal">

        <Button
            android:id="@+id/no_thanks_button"
            android:text="@string/wifi_assistant_no_thanks"
            style="@style/WifiAssistantButton.Negative" />

        <Button
            android:id="@+id/setup"
            android:text="@string/wifi_assistant_setup"
            style="@style/WifiAssistantButton.Positive" />

    </LinearLayout>

</LinearLayout>
+0 −1
Original line number Diff line number Diff line
@@ -1708,7 +1708,6 @@
    <string name="battery_saver" msgid="1426682272004907982">"ဘက်ထရီ ချွေတာသူ"</string>
    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"မည်သည့်အခါမှ"</string>
    <string name="battery_saver_turn_on_automatically_pct" msgid="3033681629861428940">"ဘက်ထရီ %1$d%% မှာ"</string>
    <string name="battery_saver_turn_on_automatically_pct" msgid="7536784431655058267">"ဘက်ထရီ %1$s မှာ"</string>
    <string name="process_stats_summary_title" msgid="1144688045609771677">"လုပ်ငန်းစဉ်ကိန်းဂဏန်းများ"</string>
    <string name="process_stats_summary" msgid="109387941605607762">"အလုပ်လုပ်ခြင်းလုပ်ငန်းစဉ်များအကြောင်း ပညာရှင်အဆင့်စာရင်း"</string>
+17 −0
Original line number Diff line number Diff line
@@ -39,6 +39,15 @@
        <item>All</item>
    </string-array>

     <!-- There is a setting to control the format of dates displayed throughout the system.  This is in the Date & Time Settings screen.  These will be adjusted to use punctuation appropriate to the user's locale. -->
    <string-array name="date_format_values" translatable="false">
        <!-- The blank item means to use whatever the locale calls for. -->
        <item></item>
        <item>MM-dd-yyyy</item>
        <item>dd-MM-yyyy</item>
        <item>yyyy-MM-dd</item>
    </string-array>

    <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
    <string-array name="screen_timeout_entries">
        <item>15 seconds</item>
@@ -442,6 +451,14 @@
        <item>Set usage cycle...</item>
    </string-array>

    <!-- Sim Cards display numbers. Range of data usage. -->
    <string-array name="sim_card_data_range">
        <!-- Last 4 digits [CHAR LIMIT=40]-->
        <item>Last 4 digits</item>
        <!-- First 4 digits [CHAR LIMIT=40]-->
        <item>First 4 digits</item>
    </string-array>

    <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
    <string-array name="wifi_frequency_band_entries">
        <!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->
+12 −2
Original line number Diff line number Diff line
@@ -396,6 +396,12 @@
    <!-- The title of the activity to pick a time zone. -->
    <string name="choose_timezone">Choose time zone</string>


    <string name="default_date_format"><xliff:g id="default_date_format">MM/dd/yyyy</xliff:g></string>
     <!-- The option in the date-format picker for using the normal format
        called for by the user's locale. -->
    <string name="normal_date_format">Regional (<xliff:g id="date" example="12-31-2009">%s</xliff:g>)</string>

    <!-- Label of preview text when tweaking font size -->
    <string name="display_preview_label">Preview:</string>
    <!-- Label for chosen font size -->
@@ -1485,9 +1491,9 @@
    <!-- Checkbox summary for option to toggle scan always available setting -->
    <string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi\u2011Fi is off</string>
    <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
    <string name="wifi_automatically_connect_title">Use open Wi\u2011Fi automatically</string>
    <string name="wifi_automatically_manage_title">Use open Wi\u2011Fi automatically</string>
    <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
    <string name="wifi_automatically_connect_summary">Let a Wi\u2011Fi assistant automatically connect to open networks determined to be high quality</string>
    <string name="wifi_automatically_manage_summary">Let a Wi\u2011Fi assistant automatically connect to open networks determined to be high quality</string>
    <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
    <string name="wifi_select_assistant_dialog_title">Choose assistant</string>
    <!-- Preference title for option to install certificates -->
@@ -2585,6 +2591,8 @@
    <string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
    <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
    <string name="master_clear_final_button_text">Erase everything</string>
    <!-- Message to draw an unlock pattern before clearing the device -->
    <string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
    <!-- Explanation of drawing unlock pattern to reset phone -->
    <string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
    <!-- Master clear failed message -->
@@ -5733,6 +5741,8 @@
    <string name="sim_editor_number">Number</string>
    <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
    <string name="sim_editor_color">SIM color</string>
    <!-- Display label numbers of Sim Editor.  [CHAR LIMIT=40] -->
    <string name="sim_editor_num_format">Display numbers</string>
    <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
    <string name="sim_card_select_title">Select SIM card</string>
    <!-- Orange label.  [CHAR LIMIT=40] -->
Loading