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

Commit 54c158e8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12014005 from 9c508c6e to 24Q4-release

Change-Id: Ifd354e09823d301dfe04104571b7f32562986a98
parents 718ab81e 9c508c6e
Loading
Loading
Loading
Loading
+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>
+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>
+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));
+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ aconfig_declarations {
    // LINT.IfChange
    srcs: [
        "a2dp.aconfig",
        "active_device_manager.aconfig",
        "asha.aconfig",
        "audio_routing.aconfig",
        "avrcp.aconfig",
+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ aconfig("bluetooth_flags_c_lib") {
  # LINT.IfChange
  sources = [
    "a2dp.aconfig",
    "active_device_manager.aconfig",
    "asha.aconfig",
    "audio_routing.aconfig",
    "avrcp.aconfig",
Loading