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

Commit a4c8622e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use FragmentActivity instead of AppCompatActivity" into tm-dev

parents 5706587d d34ca40d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" android:color="@android:color/darker_gray"/> <!-- pressed -->
    <item android:color="@android:color/white"/>
    <item android:color="?android:attr/colorBackground"/>
</selector>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<inset xmlns:android="http://schemas.android.com/apk/res/android">
    <shape android:shape="rectangle">
        <corners android:radius="@*android:dimen/config_dialogCornerRadius" />
        <corners android:radius="?android:attr/dialogCornerRadius" />
        <solid android:color="?android:attr/colorBackground" />
    </shape>
</inset>
+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@
<resources>

    <style name="ChooserActivity"
           parent="@style/Theme.AppCompat.Light.Dialog">
        <item name="windowActionBar">false</item>
        <item name="windowNoTitle">true</item>
           parent="@android:style/Theme.DeviceDefault.Light.Dialog">
        <item name="*android:windowFixedHeightMajor">100%</item>
        <item name="*android:windowFixedHeightMinor">100%</item>
        <item name="android:windowBackground">@android:color/transparent</item>
+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

@@ -59,7 +59,7 @@ import java.util.List;
 *  A CompanionDevice activity response for showing the available
 *  nearby devices to be associated with.
 */
public class CompanionDeviceActivity extends AppCompatActivity {
public class CompanionDeviceActivity extends FragmentActivity {
    private static final boolean DEBUG = false;
    private static final String TAG = CompanionDeviceActivity.class.getSimpleName();