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

Commit 40bdd5d3 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake_rel/...@141571

parent e6dd1fa1

AndroidManifest.xml

+6 −2
Original line number Diff line number Diff line
@@ -373,7 +373,9 @@ 
            </intent-filter>

        </receiver>



        <activity android:name="ActivityPicker" android:label="@string/activity_picker_label">

        <activity android:name="ActivityPicker"

                android:label="@string/activity_picker_label"

                android:theme="@android:style/Theme.Light">

            <intent-filter>

                <action android:name="android.intent.action.PICK_ACTIVITY" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -474,7 +476,9 @@ 
       </receiver>



        <!-- Standard picker for widgets -->

        <activity android:name="AppWidgetPickActivity" android:label="@string/widget_picker_title">

        <activity android:name="AppWidgetPickActivity"

                android:label="@string/widget_picker_title"

                android:theme="@android:style/Theme.Light">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_PICK" />

                <category android:name="android.intent.category.DEFAULT" />

res/layout/apn_preference_layout.xml

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

<!-- Copyright (C) 2009 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="fill_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical">



    <RelativeLayout

        android:id="@+android:id/text_layout"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16sp"

        android:layout_marginRight="6sp"

        android:layout_marginTop="6sp"

        android:layout_marginBottom="6sp"

        android:layout_weight="1"

        android:focusable="true"

        android:background="@android:drawable/menuitem_background">



        <TextView

            android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:focusable="true"

            android:singleLine="true"

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



        <TextView

            android:id="@+android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/title"

            android:layout_alignLeft="@android:id/title"

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

            android:maxLines="2" />



    </RelativeLayout>



    <RadioButton

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

        android:id="@+android:id/apn_radiobutton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="4dip"

        android:layout_marginRight="4dip"

        android:layout_gravity="center_vertical"

        android:clickable="true" />



</LinearLayout>

res/layout/installed_app_details.xml

+18 −18
Original line number Diff line number Diff line
@@ -265,6 +265,24 @@ 
                 android:layout_height="wrap_content" />

        </RelativeLayout>



        <!-- Other controls section -->

        <TextView

            style="?android:attr/listSeparatorTextViewStyle"

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



        <RelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            <Button android:id="@+id/force_stop_button"

                android:layout_alignParentRight="true"

                android:layout_alignParentTop="true"

                android:layout_centerHorizontal="true"

                android:layout_width="150dip"

                android:text="@string/force_stop"

                android:layout_height="wrap_content" />

        </RelativeLayout>



        <!-- Permissions section -->

        <LinearLayout

            android:id="@+id/permissions_section"
@@ -288,24 +306,6 @@ 
                android:layout_height="fill_parent"

                android:orientation="vertical"/>

        </LinearLayout>



        <!-- Prefered activities section -->

        <TextView

            style="?android:attr/listSeparatorTextViewStyle"

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



        <RelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            <Button android:id="@+id/force_stop_button"

                android:layout_alignParentRight="true"

                android:layout_alignParentTop="true"

                android:layout_centerHorizontal="true"

                android:layout_width="150dip"

                android:text="@string/force_stop"

                android:layout_height="wrap_content" />

        </RelativeLayout>

    </LinearLayout>

</ScrollView>

res/values-ja/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ 
    <string name="device_info_not_available">"該当なし"</string>

    <string name="device_status_activity_title">"端末の状態"</string>

    <string name="device_status">"端末の状態"</string>

    <string name="device_status_summary">"電話番号、端末識別番号、電波状態など"</string>

    <string name="device_status_summary">"電池残量、電話番号、ネットワークなど"</string>

    <string name="storage_settings_title">"SDカード &amp; 端末容量"</string>

    <string name="storage_settings_summary">"SDカードの取り外し、空き容量の表示"</string>

    <string name="status_number">"電話番号"</string>
@@ -552,7 +552,7 @@ 
    <string name="auto_launch_label">"いつもこのアプリケーションを選択する操作"</string>

    <string name="permissions_label">"許可"</string>

    <string name="cache_header_label">"キャッシュ"</string>

    <string name="clear_cache_btn_text">"キャッシュをクリア"</string>

    <string name="clear_cache_btn_text">"キャッシュを消去"</string>

    <string name="cache_size_label">"キャッシュ"</string>

    <string name="controls_label">"コントロール"</string>

    <string name="force_stop">"強制停止"</string>
@@ -601,6 +601,8 @@ 
    <string name="auto_punctuate_summary">"英語: Spaceキー2回でピリオド(.)を挿入"</string>

    <string name="show_password">"パスワードを表示"</string>

    <string name="show_password_summary">"入力時にパスワードを表示する"</string>

    <!-- no translation found for ime_security_warning (3458652708716006477) -->

    <skip />

    <string name="user_dict_settings_titlebar">"ユーザー辞書"</string>

    <string name="user_dict_settings_title">"ユーザー辞書"</string>

    <string name="user_dict_settings_summary">"ユーザー辞書への語句の追加と削除"</string>

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -751,8 +751,10 @@ 
    <string name="sound_and_display_settings_summary">Set ringtones, notifications, screen brightness</string>

    <!-- Sound settings screen, setting option name checkbox -->

    <string name="silent_mode_title">Silent mode</string>

    <!-- Sound settings screen, setting option summary text -->

    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media and alarms sounds WILL NOT be silenced in silent mode. -->

    <string name="silent_mode_summary">All sounds except media &amp; alarms are silenced</string>

    <!-- Sound settings screen, setting option summary text when going into silent mode.  Media WILL NOT be silenced in silent mode, but alarms WILL be silenced. -->

    <string name="silent_mode_incl_alarm_summary">All sounds except media are silenced</string>

    <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->

    <string name="ringtone_title">Phone ringtone</string>

    <!-- Sound settings screen, setting option summary text -->