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

Commit c8cffc42 authored by takuo's avatar takuo
Browse files

Merge branch 'eclair' into openvpn-device

parents f6463097 49c76c8b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@
            </intent-filter>
        </activity>

        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time">
            android:screenOrientation="portrait"
        <activity android:name="DateTimeSettingsSetupWizard" android:label="@string/date_and_time"
            android:screenOrientation="portrait">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
            </intent-filter>
+20 −16
Original line number Diff line number Diff line
@@ -17,20 +17,24 @@
** limitations under the License.
*/
-->

<LinearLayout
            xmlns:android="http://schemas.android.com/apk/res/android"
            style="@style/info_layout">

    <ScrollView
            android:layout_width="fill_parent"
            android:layout_height="0dip"
            android:layout_weight="1">
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textSize="18sp"
            android:text="@string/master_clear_desc" />

    <Button android:id="@+id/initiate_master_clear"
    </ScrollView>
    <Button
            android:id="@+id/initiate_master_clear"
            android:layout_gravity="center_horizontal"
        android:layout_marginTop="40dip"
            android:layout_marginTop="20dip"
            android:layout_width="150dip"
            android:layout_height="wrap_content"
            android:text="@string/master_clear_button_text"
+2 −2
Original line number Diff line number Diff line
@@ -474,11 +474,11 @@
    <string name="device_info_settings" msgid="475872867864762157">"Telefonens status"</string>
    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Systemuppdateringar"</string>
    <string name="system_update_settings_list_item_summary" msgid="9164660818865695219">"Leta efter systemuppdateringar"</string>
    <string name="firmware_version" msgid="6284872163051667788">"Fast programvara"</string>
    <string name="firmware_version" msgid="6284872163051667788">"Firmware-version"</string>
    <string name="model_number" msgid="3765737700545384794">"Modellnummer"</string>
    <string name="baseband_version" msgid="1848990160763524801">"Basbandsversion"</string>
    <string name="kernel_version" msgid="9192574954196167602">"Kernel-version"</string>
    <string name="build_number" msgid="3075795840572241758">"Skapa nummer"</string>
    <string name="build_number" msgid="3075795840572241758">"Mjukvaruversion"</string>
    <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
    <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
    <string name="device_status" msgid="607405385799807324">"Status"</string>
+1 −1
Original line number Diff line number Diff line
@@ -1441,7 +1441,7 @@
    <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
    <string name="install_applications">Unknown sources</string>
    <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
    <string name="install_unknown_applications">Allow install of non-Market applications</string>
    <string name="install_unknown_applications">Allow installation of non-Market applications</string>
    <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
    <string name="install_all_warning">Your phone and personal data are more vulnerable to attack by applications
 from unknown sources. You agree that you are solely responsible for any
+5 −1
Original line number Diff line number Diff line
@@ -458,7 +458,11 @@ public class ApnEditor extends PreferenceActivity
    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
        Preference pref = findPreference(key);
        if (pref != null) {
            if (pref.equals(mPassword)){
                pref.setSummary(starify(sharedPreferences.getString(key, "")));
            } else {
                pref.setSummary(checkNull(sharedPreferences.getString(key, "")));
            }
        }
    }
}
Loading