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

Commit 1feaa857 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@130745

parent 590c0a97

AndroidManifest.xml

+50 −43
Original line number Diff line number Diff line
@@ -30,13 +30,15 @@ 
    <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>

    <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>

    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY"/>

    <uses-permission android:name="android.permission.RESTART_PACKAGES"/>

    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>

    <uses-permission android:name="android.permission.BATTERY_STATS"/>



    <application android:label="@string/settings_label" android:icon="@drawable/ic_launcher_settings">



        <!-- Settings -->



        <activity android:name="Settings" android:label="@string/settings_label"

                android:theme="@android:style/Theme.NoTitleBar"

                android:clearTaskOnLaunch="true"

                android:launchMode="singleTop">

            <intent-filter>
@@ -51,7 +53,7 @@ 


        <activity android:name="WirelessSettings" 

                android:label="@string/radio_controls_title"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -65,7 +67,7 @@ 
        <!-- Top-level settings -->



        <activity android:name=".wifi.WifiSettings" android:label="@string/wifi_settings"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.WIFI_SETTINGS" />
@@ -76,7 +78,7 @@ 
        </activity>



        <activity android:name=".wifi.AdvancedSettings" android:label="@string/wifi_ip_settings_titlebar"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -85,7 +87,7 @@ 
        </activity>



        <activity android:name="ApnSettings" android:label="@string/apn_settings"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.APN_SETTINGS" />
@@ -96,7 +98,7 @@ 


        <activity android:name=".bluetooth.BluetoothSettings"

                  android:label="@string/bluetooth_settings_title"

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

                  >

            <intent-filter>

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

                <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -105,7 +107,7 @@ 
        </activity>



        <activity android:name="DateTimeSettings" android:label="@string/date_and_time"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.DATE_SETTINGS" />
@@ -136,7 +138,7 @@ 
        </activity>



        <activity android:name="LanguageSettings" android:label="@string/language_picker_title"

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

                >

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -145,9 +147,10 @@ 


        <activity android:name="InputMethodsSettings" android:icon="@drawable/app_settings"

                android:label="@string/input_methods_settings_title"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />

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

            </intent-filter>

        </activity>
@@ -156,12 +159,15 @@ 
                android:label="@string/user_dict_settings_titlebar">

            <intent-filter>

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

                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />

                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />

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

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

            </intent-filter>

        </activity>



        <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"

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

                >

            <intent-filter>

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

                <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -172,7 +178,7 @@ 
        </activity>



        <activity android:name="DeviceInfoSettings" android:label="@string/device_info_settings"

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

                >

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -190,7 +196,7 @@ 
        </activity>



        <activity android:name="ApplicationSettings" android:label="@string/applications_settings_header"

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

                >

            <intent-filter>

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

                <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -218,8 +224,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="SecuritySettings" android:label="@string/lockpattern_settings_title"

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

        <activity android:name="SecuritySettings" android:label="@string/security_settings_title">

            <intent-filter>

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

                <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -230,8 +235,7 @@ 
        </activity>



        <activity android:name="SimLockSettings" android:label="@string/sim_lock_settings"

                android:process="com.android.phone"

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

                android:process="com.android.phone">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -254,15 +258,14 @@ 


        <activity android:name="ChooseLockPatternTutorial" 

            android:label="@string/lockpattern_change_lock_pattern_label"

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

            >

            <intent-filter>

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

            </intent-filter>

        </activity>

        

        <activity android:name="ChooseLockPatternExample" 

            android:label="@string/lockpattern_change_lock_pattern_label"

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

            android:label="@string/lockpattern_change_lock_pattern_label">

            <intent-filter>

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

            </intent-filter>
@@ -271,8 +274,7 @@ 
        <activity android:name="ZoneList" android:label="@string/choose_timezone" />



        <activity android:name=".deviceinfo.Status" android:label="@string/device_status_activity_title"

                android:process="com.android.phone"

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

                android:process="com.android.phone">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -280,8 +282,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title"

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

        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">

            <intent-filter>

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

                <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -312,8 +313,14 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".quicklaunch.QuickLaunchSettings" android:label="@string/quick_launch_title"

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

        <activity android:name="MediaFormat" android:label="@string/media_format_title">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name=".quicklaunch.QuickLaunchSettings" 

                android:label="@string/quick_launch_title">

            <intent-filter>

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

                <action android:name="com.android.settings.QUICK_LAUNCH_SETTINGS" />
@@ -329,8 +336,7 @@ 
        </activity>



        <activity android:name="DevelopmentSettings" android:icon="@drawable/app_settings"

                android:label="@string/development_settings_title"

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

                android:label="@string/development_settings_title">

            <intent-filter>

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

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -340,19 +346,6 @@ 






        <!-- System-triggered settings -->



        <receiver android:name="SdCardErrorReceiver">

            <intent-filter>

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

                <data android:scheme="file" />

            </intent-filter>

            <intent-filter>

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

                <data android:scheme="file" />

            </intent-filter>

        </receiver>



        <!-- Bluetooth stuff -->



        <activity android:name=".bluetooth.ConnectSpecificProfilesActivity"
@@ -417,7 +410,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="BatteryHistory" android:label="@string/battery_history_label">

        <activity android:name=".battery_history.BatteryHistory" android:label="@string/battery_history_label">

            <intent-filter>

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

                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -468,8 +461,7 @@ 
            </intent-filter>

        </activity>



        <activity android:name="TestingSettings" android:label="@string/testing"

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

        <activity android:name="TestingSettings" android:label="@string/testing">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -483,6 +475,21 @@ 
            </intent-filter>

       </receiver>



        <!-- Standard picker for gadgets -->



        <activity android:name="GadgetPickActivity" android:label="@string/gadget_picker_title">

            <intent-filter>

                <action android:name="android.gadget.action.PICK_GADGET" />

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

            </intent-filter>

        </activity>



        <activity android:name="UsageStats" android:label="@string/usage_stats_label">

            <intent-filter>

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

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

            </intent-filter>

        </activity>



    </application>

res/layout/battery_history.xml

+135 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:id="@+id/topLayout"

    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" />



    <LinearLayout

        android:id="@+id/graphLayout"

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent" >



        <Spinner

            android:id="@+id/typeSpinner"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

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



        <Spinner

            android:id="@+id/whichSpinner"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

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



        <ScrollView

            android:layout_width="fill_parent"

            android:layout_height="wrap_content" >



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content" >

            

        <TextView

            android:id="@+id/messageText"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:textSize="17dp"

            android:visibility="gone" />



        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button0"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button1"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button2"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button3"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button4"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button5"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button6"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />

    

        <com.android.settings.battery_history.GraphableButton

            android:id="@+id/button7"

            android:layout_width="fill_parent"

            android:layout_height="0dp"

            android:layout_marginLeft="4dp"

            android:layout_marginRight="4dp"

            android:layout_marginBottom="4dp"

            android:layout_weight="1" />



        </LinearLayout>

        </ScrollView>



    </LinearLayout>



    <LinearLayout

        android:id="@+id/textLayout"

        android:visibility="gone"

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent" >



        <ScrollView

            android:layout_width="fill_parent"

            android:layout_height="fill_parent" >

            <TextView

            android:id="@+id/text"

                android:id="@+id/detailsText"

                android:layout_width="fill_parent"

                android:textSize="17dp"

                android:layout_height="1000dp"/>

        </ScrollView>



    </LinearLayout>



</LinearLayout>

res/layout/bluetooth_data_entry.xml

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

<!--

/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml

**

** Copyright 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:orientation="vertical"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent">



    <TextView android:id="@+id/dataLabel"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content" 

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



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

        android:layout_marginTop="2dip"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:scrollHorizontally="true"

        android:autoText="false"

        android:capitalize="none"

        android:singleLine="true"

        android:password="true"

        android:maxLines="1" />

    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content">



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

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_weight="0.5"

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



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

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_weight="0.5"

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

            

    </LinearLayout>

</LinearLayout>

res/layout/bluetooth_discoverability_panel.xml

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

<!--

/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml

**

** Copyright 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.

*/

-->

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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content"

    android:paddingLeft="2dip"

    android:paddingRight="2dip">



    <LinearLayout

    	android:text="@string/bluetooth_discoverability_panel_title"

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="20dip"

        android:paddingRight="20dip">



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

            android:visibility="visible"

            android:text="@string/bluetooth_discoverable"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



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

            android:visibility="visible"

            android:text="@string/bluetooth_connectable"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



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

            android:visibility="visible"

            android:text="@string/bluetooth_neither"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



    </LinearLayout>

</FrameLayout>

res/layout/bluetooth_discovery_screen.xml

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

<!--

/* //device/apps/Settings/res/layout/bluetooth_discovery_screen.xml

**

** Copyright 2007, 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.

*/

-->



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

    android:layout_width="fill_parent"

    android:layout_height="fill_parent"

    android:paddingLeft="2dip"

    android:paddingRight="2dip">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:paddingLeft="3dip"

        android:paddingRight="3dip">



        <TextView android:id="@+id/label"

            android:textStyle="bold"

            android:text="@string/bluetooth_scan_for_new_devices"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"/>



        <ListView android:id="@android:id/list"

            android:layout_marginTop="5dip"

            android:layout_width="fill_parent"

            android:layout_height="fill_parent"

            android:drawSelectorOnTop="false">

        </ListView>

    </LinearLayout>

</FrameLayout>