filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Remove GServices

Browse Source 
We don't have an actual implementation returning anything but the
defaults, so apply the defaults directly anywhere we need them

Change-Id: Ic651b4b13977799f2f4d2c702c430798fbff77f8
This commit is contained in:
Michael W
2024-12-26 14:55:12 +01:00
parent 7f22a3eea7
commit a2f67b4f7b
64 changed files with 91 additions and 3763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/apn_preference_layout.xml
-69
View File
@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<!--
This is the layout file for an ApnPreference in the ApnSettingsActivity. The preference
is a list item.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
style="@style/ApnPreferenceLayoutStyle">
<RelativeLayout
android:id="@+id/text_layout"
android:layout_width="0dip"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
<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/textAppearanceListItem" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="2" />
</RelativeLayout>
<RadioButton
android:id="@+id/apn_radiobutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:layout_gravity="center_vertical"
android:clickable="true" />
</LinearLayout>
res/layout/debug_mmsconfig_activity.xml
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"
class="com.android.messaging.ui.debug.DebugMmsConfigFragment"
android:id="@+id/debug_mmsconfig_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
res/layout/debug_mmsconfig_item_view.xml
-46
View File
@@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<com.android.messaging.ui.debug.DebugMmsConfigItemView
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@android:color/background_light"
android:gravity="center_vertical"
android:clickable="true"
style="@style/DebugMmsConfigItemStyle" >
<TextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:singleLine="true"
android:maxLines="1"
android:gravity="center_vertical"/>
<Switch
android:id="@+id/switch_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="gone" />
<TextView
android:id="@+id/text_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:singleLine="true"
android:gravity="center_vertical"
android:visibility="gone"/>
</com.android.messaging.ui.debug.DebugMmsConfigItemView>
res/layout/debug_sms_mms_from_dump_file_dialog.xml
-32
View File
@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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="match_parent"
android:layout_height="match_parent"
android:padding="6dp"
android:background="@color/conversation_background"
>
<ListView android:id="@+id/dump_file_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawSelectorOnTop="false"
android:longClickable="false"/>
</FrameLayout>
res/layout/mms_config_debug_fragment.xml
-53
View File
@@ -1,53 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="16dp">
<TextView
android:id="@+id/sim_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/debug_sub_id_spinner_text" />
<Spinner
android:id="@+id/sim_selector"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#555555" />
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:divider="@null"
android:dividerHeight="0px" />
</LinearLayout>
res/menu/archived_conversation_list_menu.xml
-25
View File
@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" >
<item
android:id="@+id/action_debug_options"
android:orderInCategory="9900"
android:title="@string/action_debug_options"
android:showAsAction="never"/>
</menu>
res/menu/conversation_list_fragment_menu.xml
+1 -6
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -42,10 +43,4 @@
android:title="@string/action_settings"
appcompat:showAsAction="never"/>
<item
android:id="@+id/action_debug_options"
android:orderInCategory="9900"
android:title="@string/action_debug_options"
appcompat:showAsAction="never"/>
</menu>
res/values/attrs.xml
+1 -1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -57,5 +58,4 @@
<enum name="subcompact" value="2" />
</attr>
</declare-styleable>
<attr name="apnPreferenceStyle" format="reference" />
</resources>
res/values/constants.xml
+1 -9
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -45,21 +46,12 @@
<string name="wireless_alerts_key" translatable="false">buglesub_wireless_alerts_key</string>
<string name="apn_list_pref_key" translatable="false">buglesub_apn_list</string>
<!-- Debug preferences -->
<string name="debug_pref_key" translatable="false">debug_category</string>
<string name="dump_sms_pref_key" translatable="false">dump_sms</string>
<bool name="dump_sms_pref_default" translatable="false">false</bool>
<string name="dump_mms_pref_key" translatable="false">dump_mms</string>
<bool name="dump_mms_pref_default" translatable="false">false</bool>
<!-- SMS/MMS settings keys -->
<!--
TODO: Several of these are currently unused but are expected to be needed to
implement SMS/MMS delivery and basic settings. Once we have the core functionality in place
we should do a pass to remove any unused values here.
-->
<string name="sms_apns_key" translatable="false">sms_apns_key</string>
<string name="use_local_apn_pref_key" translatable="false">use_local_apn_pref_key</string>
<bool name="use_local_apn_pref_default" translatable="false">false</bool>
res/values/strings.xml
-44
View File
@@ -688,50 +688,6 @@
<!-- Label for new message button in share intent dialog -->
<string name="share_cancel">Cancel</string>
<!-- Screen title after user selects APNs setting option -->
<string name="apn_edit">Edit access point</string>
<!-- Edit access point label summary text when no value has been set -->
<string name="apn_not_set">Not set</string>
<!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
<string name="apn_name">Name</string>
<!-- Edit access point labels: -->
<string name="apn_mmsc">MMSC</string>
<!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
<string name="apn_mms_proxy">MMS proxy</string>
<!-- Edit access point labels: The port on the proxy used for MMS-->
<string name="apn_mms_port">MMS port</string>
<!-- Edit access point labels: -->
<string name="apn_mcc">MCC</string>
<!-- Edit access point labels: -->
<string name="apn_mnc">MNC</string>
<!-- Edit access point screen menu option to delete this APN -->
<string name="menu_delete_apn">Delete APN</string>
<!-- APNs screen menu option to create a brand spanking new APN -->
<string name="menu_new_apn">New APN</string>
<!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
<string name="menu_save_apn">Save</string>
<!-- Edit access point screen menu option to discard the user's changes for this APN -->
<string name="menu_discard_apn_change">Discard</string>
<!-- APN error dialog messages: -->
<string name="error_apn_name_empty">The Name field can\'t be empty.</string>
<!-- APN error dialog messages: -->
<string name="error_mcc_not3">MCC field must be 3 digits.</string>
<!-- APN error dialog messages: -->
<string name="error_mnc_not23">MNC field must be 2 or 3 digits.</string>
<!-- The message of dialog indicated restoring default APN settings in progress -->
<string name="restore_default_apn">Restoring default APN settings.</string>
<!-- APNs screen menu option to reset default APN settings -->
<string name="menu_restore_default_apn">Reset to default</string>
<!-- APNs screen toast message to inform reset default APN settings is completed -->
<string name="restore_default_apn_completed">Reset default APN settings completed.</string>
<!-- Name to assign to a Network Access Point that was saved without a name -->
<string name="untitled_apn">Untitled</string>
<!-- Title for Access Point Names settings -->
<string name="sms_apns_title">Access Point Names</string>
<!-- Title for Access Point Names settings activity -->
<string name="apn_settings">APNs</string>
<!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
<string name="apn_settings_not_available">Access Point Name settings are not available for this user</string>
<!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
<string name="copy_to_clipboard_dialog_title">Copy to clipboard?</string>
<!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
res/values/styles.xml
-10
View File
@@ -34,7 +34,6 @@
<item name="colorAccent">@color/lineage_accent</item>
<item name="android:textColorHighlight">@color/text_highlight_color</item>
<item name="actionBarStyle">@style/BugleActionBar</item>
<item name="apnPreferenceStyle">@style/ApnPreference</item>
<item name="alertDialogTheme">@style/AlertDialogTheme</item>
</style>
@@ -466,15 +465,6 @@
<item name="colorAccent">@color/search_view_text_cursor</item>
</style>
<style name="ApnPreference">
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
<style name="ApnPreferenceLayoutStyle">
<item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
</style>
<style name="SettingsListItem">
<item name="android:textSize">@dimen/settings_list_text_size</item>
<item name="android:textColor">@color/settings_list_text_primary</item>
res/xml/apn_editor.xml
-63
View File
@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/apn_edit">
<EditTextPreference
android:title="@string/apn_name"
android:dialogTitle="@string/apn_name"
android:key="apn_name"
android:singleLine="true"
android:inputType="text"
/>
<EditTextPreference
android:title="@string/apn_mmsc"
android:dialogTitle="@string/apn_mmsc"
android:key="apn_mmsc"
android:singleLine="true"
android:inputType="textUri"
/>
<EditTextPreference
android:title="@string/apn_mms_proxy"
android:dialogTitle="@string/apn_mms_proxy"
android:key="apn_mms_proxy"
android:singleLine="true"
android:inputType="textUri"
/>
<EditTextPreference
android:title="@string/apn_mms_port"
android:dialogTitle="@string/apn_mms_port"
android:key="apn_mms_port"
android:singleLine="true"
android:inputType="number"
/>
<EditTextPreference
android:title="@string/apn_mcc"
android:dialogTitle="@string/apn_mcc"
android:key="apn_mcc"
android:singleLine="true"
android:inputType="number"
/>
<EditTextPreference
android:title="@string/apn_mnc"
android:dialogTitle="@string/apn_mnc"
android:key="apn_mnc"
android:singleLine="true"
android:inputType="number"
/>
</PreferenceScreen>
res/xml/apn_settings.xml
-21
View File
@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 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.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/apn_settings" android:key="@string/apn_list_pref_key">
</PreferenceScreen>
res/xml/preferences_application.xml
+1 -19
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Copyright (C) 2024 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -57,23 +58,4 @@
<PreferenceScreen
android:key="@string/advanced_pref_key"
android:title="@string/advanced_settings" />
<PreferenceCategory
android:key="@string/debug_pref_key"
android:title="@string/debug_category_pref_title">
<CheckBoxPreference
android:key="@string/dump_sms_pref_key"
android:title="@string/dump_sms_pref_title"
android:summary="@string/dump_sms_pref_summary"
android:defaultValue="@bool/dump_sms_pref_default" />
<CheckBoxPreference
android:key="@string/dump_mms_pref_key"
android:title="@string/dump_mms_pref_title"
android:summary="@string/dump_mms_pref_summary"
android:defaultValue="@bool/dump_mms_pref_default" />
</PreferenceCategory>
</PreferenceScreen>
res/xml/preferences_per_subscription.xml
-4
View File
@@ -55,9 +55,5 @@
android:summary="@string/delivery_reports_pref_summary"
android:defaultValue="@bool/delivery_reports_pref_default" />
<PreferenceScreen
android:key="@string/sms_apns_key"
android:title="@string/sms_apns_title" />
</PreferenceCategory>
</PreferenceScreen>