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

Commit 8d8d92f3 authored by Tony Huang's avatar Tony Huang
Browse files

Refactor to androidx fragment and appcompatactivity 

1. Update all deprecated Fragment to androidx Fragment
2. Update Activity to AppCompatActivity or FragmentActivity.
3. Update other components to support libraries version.

Bug: 111921428
Test: manual
Test: atest DocumentsUITests
Change-Id: I2e629867b961bc6b52cf5d15378e121e4efa33d3
parent 36036581

res/drawable/list_checker.xml

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

<!-- Copyright (C) 2018 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.

-->

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

    <item

        android:state_checked="true"

        android:drawable="@drawable/ic_done"/>

    <item

        android:drawable="@android:color/transparent"/>

</selector>
 
 No newline at end of file

res/layout/drawer_layout.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
            android:layout_height="match_parent"

            android:orientation="vertical">



            <Toolbar

            <androidx.appcompat.widget.Toolbar

                android:id="@+id/toolbar"

                android:layout_width="match_parent"

                android:layout_height="?android:attr/actionBarSize"
@@ -50,7 +50,7 @@ 
                    android:background="@android:color/transparent"

                    android:overlapAnchor="true" />



            </Toolbar>

            </androidx.appcompat.widget.Toolbar>



            <FrameLayout

                android:layout_width="match_parent"
@@ -78,7 +78,7 @@ 
            android:elevation="0dp"

            android:background="?android:attr/colorPrimary">



            <Toolbar

            <androidx.appcompat.widget.Toolbar

                android:id="@+id/roots_toolbar"

                android:layout_width="match_parent"

                android:layout_height="?android:attr/actionBarSize"

res/layout/fixed_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



        <Toolbar

        <androidx.appcompat.widget.Toolbar

            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"
@@ -43,7 +43,7 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </Toolbar>

        </androidx.appcompat.widget.Toolbar>



        <LinearLayout

            android:layout_width="match_parent"

res/menu/activity.xml

+21 −19
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
     limitations under the License.

-->



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

<menu

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

    xmlns:app="http://schemas.android.com/apk/res-auto">

<!-- showAsAction flag impacts the behavior of SearchView.

     When set to collapseActionView, collapsing SearchView to icon is the

     default behavior. It would fit UX, however after expanding SearchView is
@@ -27,10 +29,10 @@ 
        android:id="@+id/option_menu_search"

        android:title="@string/menu_search"

        android:icon="@drawable/ic_menu_search"

        android:showAsAction="always"

        android:actionViewClass="android.widget.SearchView"

        android:imeOptions="actionSearch"

        android:visible="false" />

        android:visible="false"

        app:showAsAction="always"

        app:actionViewClass="androidx.appcompat.widget.SearchView"/>

<!-- This group is being hidden when searching is in full bar mode-->

    <group android:id="@+id/group_hide_when_searching">

        <item
@@ -38,30 +40,30 @@ 
            android:title="Debug"

            android:icon="@drawable/ic_debug_menu"

            android:visible="false"

            android:showAsAction="always" />

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_grid"

            android:title="@string/menu_grid"

            android:icon="@drawable/ic_menu_view_grid"

            android:showAsAction="always" />

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_list"

            android:title="@string/menu_list"

            android:icon="@drawable/ic_menu_view_list"

            android:showAsAction="always" />

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_new_window"

            android:title="@string/menu_new_window"

            android:alphabeticShortcut="n"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false"

            app:showAsAction="never"/>

        <item

            android:id="@+id/option_menu_create_dir"

            android:title="@string/menu_create_dir"

            android:icon="@drawable/ic_menu_new_folder"

            android:alphabeticShortcut="e"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false"

            app:showAsAction="never"/>

        <item

            android:id="@+id/option_menu_sort"

            android:title="@string/menu_sort"
@@ -71,21 +73,21 @@ 
            android:id="@+id/option_menu_select_all"

            android:title="@string/menu_select_all"

            android:alphabeticShortcut="a"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false"

            app:showAsAction="never"/>

        <item

            android:id="@+id/option_menu_advanced"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false"

            app:showAsAction="never"/>

        <item

            android:id="@+id/option_menu_settings"

            android:title="@string/menu_settings"

            android:showAsAction="never"

            android:visible="false" />

            android:visible="false"

            app:showAsAction="never"/>

       <item

           android:id="@+id/option_menu_inspect"

           android:title="@string/menu_inspect"

           android:showAsAction="never"

           android:visible="false" />

           android:visible="false"

           app:showAsAction="never"/>

    </group>

</menu>

res/values-night/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
        <item name="android:subtitleTextStyle">@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse</item>

    </style>



    <style name="actionModeStyle" parent="@android:style/Widget.Material.ActionMode">

    <style name="actionModeStyle" parent="Widget.AppCompat.ActionMode">

        <item name="android:background">?android:attr/actionModeBackground</item>

        <item name="android:backgroundSplit">?android:attr/actionModeBackground</item>

        <item name="android:titleTextStyle">@android:style/TextAppearance.Material.Widget.ActionMode.Title.Inverse</item>