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

Commit a7f873f8 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Remove unused BluetoothMapSettings and related classes" into main am: 0246dc9d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3140040



Change-Id: I77a9c941a4183c2f755dcab6f527f2ff082237b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1fca289f 0246dc9d

android/app/AndroidManifest.xml

+0 −7
Original line number Diff line number Diff line
@@ -161,13 +161,6 @@ 
            </intent-filter>

        </service>



        <activity android:name="com.android.bluetooth.map.BluetoothMapSettings"

              android:process="@string/process"

              android:label="@string/bluetooth_map_settings_title"

              android:excludeFromRecents="true"

              android:configChanges="orientation|keyboardHidden"

              android:enabled="false">

        </activity>

        <provider android:name="com.android.bluetooth.map.MmsFileProvider"

             android:authorities="com.android.bluetooth.map.MmsFileProvider"

             android:enabled="false"

android/app/lint-baseline.xml

+0 −16
Original line number Diff line number Diff line
@@ -569,22 +569,6 @@ 
            line="111"/>

    </issue>



    <issue

        id="InflateParams"

        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout's root element)">

        <location

            file="packages/modules/Bluetooth/android/app/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java"

            line="110"/>

    </issue>



    <issue

        id="InflateParams"

        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout's root element)">

        <location

            file="packages/modules/Bluetooth/android/app/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java"

            line="231"/>

    </issue>



    <issue

        id="InflateParams"

        message="Avoid passing `null` as the view root (needed to resolve layout parameters on the inflated layout's root element)">

android/app/res/layout/bluetooth_map_settings.xml

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

<!--

/*

* Copyright (C) 2014 Samsung System LSI

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

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/bluetooth_map_settings_linear_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    tools:context=".BluetoothMapSettings" >



    <TextView

        android:id="@+id/bluetooth_map_settings_description_text_view"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"



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



    <ExpandableListView

        android:id="@+id/bluetooth_map_settings_list_view"

        android:layout_width="fill_parent"

        android:layout_height="0dip"

        android:layout_weight="3"

        android:orientation="vertical" >



    </ExpandableListView>



</LinearLayout>

android/app/res/layout/bluetooth_map_settings_account_group.xml

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

<!--

/*

* Copyright (C) 2014 Samsung System LSI

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

*/

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >

    <ImageView

        android:id="@+id/bluetooth_map_settings_group_icon"

        android:layout_width="64dp"

        android:layout_height="64dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:maxWidth="64dp"

        android:maxHeight="64dp"

        android:layout_marginStart="30dp"

         />

    <TextView

        android:id ="@+id/bluetooth_map_settings_group_text_view"

        android:layout_width ="wrap_content"

        android:layout_height ="wrap_content"

        android:layout_toEndOf="@id/bluetooth_map_settings_group_icon"/>

    <CheckBox

        android:id ="@+id/bluetooth_map_settings_group_checkbox"

        android:layout_width ="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

        android:layout_centerVertical="true"

        android:focusable="false"/>







</RelativeLayout>
 
 No newline at end of file

android/app/res/layout/bluetooth_map_settings_account_item.xml

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

<!--

/*

* Copyright (C) 2014 Samsung System LSI

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="fill_parent"

    android:layout_height="51dp"

    android:clickable="true"

    android:gravity="fill_vertical"

    android:orientation="horizontal"

    android:paddingEnd="51dp"

    android:paddingStart="25dp"

    tools:context=".BluetoothMapSettings" android:baselineAligned="false">



        <TextView

            android:id="@+id/bluetooth_map_settings_item_text_view"

            android:layout_width="match_parent"

            android:layout_height="51dp"

            android:layout_weight="1"

            android:gravity="start|center_vertical"/>



        <CheckBox

            android:id="@+id/bluetooth_map_settings_item_check"

            android:layout_width="110dp"

            android:layout_height="51dp"

            android:layout_gravity="end"

            android:layout_weight="2"

            android:gravity="end|center_vertical" />

</LinearLayout>