Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev (d810a6a5) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -1642,6 +1642,16 @@
		</intent-filter>
		</activity>

		<activity android:name=".SmsDefaultDialog"
		android:label="@string/sms_application_title"
		android:excludeFromRecents="true"
		android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
		<intent-filter>
		<action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<activity android:name="Settings$NotificationAccessSettingsActivity"
		android:label="@string/manage_notification_access"
		android:taskAffinity=""

res/layout/sms_preference_item.xml

0 → 100755

+41 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2013, 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="?android:attr/listPreferredItemHeight"
		android:padding="6dip">
		<ImageView
		android:id="@+id/sms_image"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:padding="6dip"
		/>
		<CheckedTextView
		android:id="@+id/sms_text"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:textColor="?android:attr/textColorAlertDialogListItem"
		android:gravity="center_vertical"
		android:paddingEnd="7dip"
		android:checkMark="?android:attr/listChoiceIndicatorSingle"
		android:ellipsize="marquee"
		/>
		</LinearLayout>

res/values/strings.xml

+9 −7

Original line number	Diff line number	Diff line
		@@ -400,7 +400,7 @@
		<string name="intent_sender_account_label">Account: </string>

		<!-- HTTP proxy settings title -->
		<string name="proxy_settings_title">Proxy settings</string>
		<string name="proxy_settings_title">Proxy</string>
		<!-- HTTP proxy settings. Button to clear the proxy box. -->
		<string name="proxy_clear_text">Clear</string>
		<!-- HTTP proxy settings. The port number label. -->
		@@ -2380,8 +2380,13 @@
		<!-- Wireless controls, item title to go into the network settings -->
		<string name="network_settings_title">Mobile networks</string>

		<!-- Manage mobile plan [CHAR LIMIT=35]-->
		<string name="manage_mobile_plan_title" translatable="true">Manage mobile plan</string>
		<!-- Mobile plan [CHAR LIMIT=35]-->
		<string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>

		<!-- SMS Application [CHAR LIMIT=35]-->
		<string name="sms_application_title" translatable="true">Default SMS app</string>
		<string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
		<string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS application?</string>

		<!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
		<string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string>
		@@ -4175,8 +4180,7 @@
		<!-- Messaage shown in dialog when you can't manually sync -->
		<string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>

		<string name="wimax_settings">4G settings</string>
		<string name="wimax_settings_summary">Set up & manage 4G network and modem</string>
		<string name="wimax_settings">4G</string>
		<string name="status_wimax_mac_address">4G MAC address</string>
		<!-- This is displayed to the user when the device needs to be decrypted -->
		<string name="enter_password">Type password to decrypt storage</string>
		@@ -4802,8 +4806,6 @@

		<!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
		<string name="cell_broadcast_settings">Cell broadcasts</string>
		<!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
		<string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>

		<!-- User app limits screen title [CHAR LIMIT=35] -->
		<string name="user_restrictions_title">Application and content restrictions</string>

res/xml/wireless_settings.xml

+24 −21

Original line number	Diff line number	Diff line
		@@ -23,25 +23,10 @@
		android:persistent="false"
		android:disableDependentsState="true" />

		<PreferenceScreen
		android:fragment="com.android.settings.vpn2.VpnSettings"
		android:key="vpn_settings"
		android:title="@string/vpn_settings_title" />

		<PreferenceScreen
		android:fragment="com.android.settings.TetherSettings"
		android:key="tether_settings"
		android:title="@string/tether_settings_title_all" />

		<PreferenceScreen
		android:key="wimax_settings"
		android:title="@string/wimax_settings"
		android:summary="@string/wimax_settings_summary" >
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings.wimax"
		android:targetClass="com.android.settings.wimax.WimaxSettings" />
		</PreferenceScreen>
		<com.android.settings.SmsListPreference
		android:key="sms_application"
		android:title="@string/sms_application_title"
		android:persistent="false" />

		<CheckBoxPreference
		android:key="toggle_nfc"
		@@ -54,6 +39,16 @@
		android:key="android_beam_settings"
		android:title="@string/android_beam_settings_title" />

		<PreferenceScreen
		android:fragment="com.android.settings.TetherSettings"
		android:key="tether_settings"
		android:title="@string/tether_settings_title_all" />

		<PreferenceScreen
		android:fragment="com.android.settings.vpn2.VpnSettings"
		android:key="vpn_settings"
		android:title="@string/vpn_settings_title" />

		<PreferenceScreen
		android:key="mobile_network_settings"
		android:title="@string/network_settings_title"
		@@ -69,6 +64,15 @@
		android:title="@string/manage_mobile_plan_title"
		android:persistent="false" />

		<PreferenceScreen
		android:key="wimax_settings"
		android:title="@string/wimax_settings" >
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings.wimax"
		android:targetClass="com.android.settings.wimax.WimaxSettings" />
		</PreferenceScreen>

		<CheckBoxPreference
		android:key="toggle_nsd"
		android:title="@string/nsd_quick_toggle_title"
		@@ -82,8 +86,7 @@

		<PreferenceScreen
		android:key="cell_broadcast_settings"
		android:title="@string/cell_broadcast_settings"
		android:summary="@string/cell_broadcast_settings_summary" >
		android:title="@string/cell_broadcast_settings" >
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.cellbroadcastreceiver"

src/com/android/settings/DevelopmentSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1453,7 +1453,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
		} catch (RemoteException e) {
		} catch (Exception e) {
		Log.i(TAG, "Somone wrote a bad service '" + service
		Log.i(TAG, "Someone wrote a bad service '" + service
		+ "' that doesn't like to be poked: " + e);
		}
		data.recycle();