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

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

Merge "Opt out from edge-to-edge in OppTransferHistory" into main am: 40ceeb1a 

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



Change-Id: I200cb1c8280b2f9c9d4a6b100f8584efaf297481
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c74d73f1 40ceeb1a

android/app/res/values-v35/styles.xml

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

<!--

  ~ Copyright (C) 2024 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

  -->



<resources>



    <!--

        TODO(b/309578419): Make activities handle insets properly and then remove this.

    -->

    <style name="OptOutEdgeToEdgeEnforcement">

        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>



</resources>

android/app/res/values/styles.xml

+6 −1
Original line number Diff line number Diff line
@@ -47,4 +47,9 @@ 


    <style name="dialog" parent="android:style/Theme.Material.Light.Dialog.Alert"/>



    <!--

        TODO(b/309578419): Make activities handle insets properly and then remove this.

    -->

    <style name="OptOutEdgeToEdgeEnforcement" />



</resources>

android/app/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ public class BluetoothOppTransferHistory extends Activity 
    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        // TODO(b/309578419): Make this activity handle insets properly and then remove this.

        getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);



        setContentView(R.layout.bluetooth_transfers_page);

        mListView = (ListView) findViewById(R.id.list);

        mListView.setEmptyView(findViewById(R.id.empty));