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

Commit 8f327448 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix UI bugs in tracing demo app" into main

parents 00a9f5f2 008da7c3

tracinglib/demo/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ android_app { 
    name: "CoroutineTracingDemoApp",

    platform_apis: true,

    certificate: "platform",

    min_sdk_version: "34",

    target_sdk_version: "34",

    use_resource_processor: true,

    srcs: ["src/**/*.kt"],

    manifest: "app-manifest.xml",

tracinglib/demo/app-manifest.xml

+2 −5
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ 
        package="com.android.app.tracing.demo">

    <application

        android:name=".MainApplication"

        android:allowBackup="false"

        android:label="@string/app_name"

        android:supportsRtl="true"

        android:theme="@style/DefaultTheme">

        android:label="@string/app_name">

        <activity

            android:name=".MainActivity"

            android:theme="@style/ActivityTheme"

            android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -30,5 +28,4 @@ 
            </intent-filter>

        </activity>

    </application>



</manifest>

tracinglib/demo/res/layout/activity_main.xml

+8 −2
Original line number Diff line number Diff line
@@ -15,15 +15,21 @@ 
-->

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

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

    android:id="@+id/main_activity_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    tools:context=".MainActivity">



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/app_name"

        android:layout_gravity="center"

        android:textAppearance="@style/Title"/>



    <LinearLayout

        android:id="@+id/button_container"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical" />

tracinglib/demo/res/values/strings.xml

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

<!--

     Copyright (C) 2024 The Android Open Source Project

tracinglib/demo/res/values/styles.xml

0 → 100644
+24 −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>

    <style name="ActivityTheme" parent="@android:style/Theme.DeviceDefault.NoActionBar">

        <item name="android:windowLayoutInDisplayCutoutMode">

            never

        </item>

    </style>

    <style name="Title" parent="@android:style/TextAppearance.Material.Title" />

</resources>
 
 No newline at end of file