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

Commit 676ae03d authored by Colin Marsch's avatar Colin Marsch Committed by Michael Bestas
Browse files

AOSP/DeskClock - Update Fragment related code to use AndroidX 

Kotlin AndroidX upgrades, as well as Java AndroidX upgrades to ensure
both DeskClock and DeskClockJava targets pass the tests.

Test: manual, tested the DeskClock UI. As well tests were ran as follows

$ source build/envsetup.sh
$ lunch aosp_sargo-userdebug
$ make DeskClock
$ adb install out/target/product/sargo/product/app/DeskClock/DeskClock.apk
$ atest DeskClockTests
$ make DeskClockJava
$ adb install out/target/product/sargo/product/app/DeskClockJava/DeskClockJava.apk
$ atest DeskClockTests

BUG: 157255731
Change-Id: I4e038932e913a125265bcf5c0091f69e34ec16ce
parent 96c7cd5b

src/com/android/deskclock/AlarmClockFragment.java

+9 −8
Original line number Diff line number Diff line
@@ -16,24 +16,23 @@ 


package com.android.deskclock;



import android.app.LoaderManager;

import android.content.Context;

import android.content.Intent;

import android.content.Loader;

import android.database.Cursor;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.SystemClock;

import androidx.annotation.NonNull;

import com.google.android.material.snackbar.Snackbar;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;

import androidx.annotation.NonNull;

import androidx.loader.app.LoaderManager;

import androidx.loader.content.Loader;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



import com.android.deskclock.alarms.AlarmTimeClickHandler;

import com.android.deskclock.alarms.AlarmUpdateHandler;
@@ -49,6 +48,8 @@ import com.android.deskclock.widget.EmptyViewController; 
import com.android.deskclock.widget.toast.SnackbarManager;

import com.android.deskclock.widget.toast.ToastManager;



import com.google.android.material.snackbar.Snackbar;



import java.util.ArrayList;

import java.util.List;
@@ -102,7 +103,7 @@ public final class AlarmClockFragment extends DeskClockFragment implements 
    @Override

    public void onCreate(Bundle savedState) {

        super.onCreate(savedState);

        mCursorLoader = getLoaderManager().initLoader(0, null, this);

        mCursorLoader = LoaderManager.getInstance(this).initLoader(0, null, this);

        if (savedState != null) {

            mExpandedAlarmId = savedState.getLong(KEY_EXPANDED_ID, Alarm.INVALID_ID);

        }
@@ -186,7 +187,7 @@ public final class AlarmClockFragment extends DeskClockFragment implements 
        super.onStart();



        if (!isTabSelected()) {

            TimePickerDialogFragment.removeTimeEditDialog(getFragmentManager());

            TimePickerDialogFragment.removeTimeEditDialog(getParentFragmentManager());

        }

    }

src/com/android/deskclock/DeskClock.java

+10 −9
Original line number Diff line number Diff line
@@ -20,17 +20,9 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.app.Fragment;

import android.content.Intent;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import androidx.annotation.StringRes;

import com.google.android.material.snackbar.Snackbar;

import com.google.android.material.tabs.TabLayout;

import androidx.viewpager.widget.ViewPager;

import androidx.viewpager.widget.ViewPager.OnPageChangeListener;

import androidx.appcompat.app.ActionBar;

import androidx.appcompat.widget.Toolbar;

import android.view.KeyEvent;

import android.view.Menu;

import android.view.MenuItem;
@@ -39,6 +31,12 @@ import android.view.View.OnClickListener; 
import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;

import androidx.annotation.StringRes;

import androidx.appcompat.app.ActionBar;

import androidx.appcompat.widget.Toolbar;

import androidx.fragment.app.Fragment;

import androidx.viewpager.widget.ViewPager;

import androidx.viewpager.widget.ViewPager.OnPageChangeListener;



import com.android.deskclock.actionbarmenu.MenuItemControllerFactory;

import com.android.deskclock.actionbarmenu.NightModeMenuItemController;
@@ -53,6 +51,9 @@ import com.android.deskclock.uidata.TabListener; 
import com.android.deskclock.uidata.UiDataModel;

import com.android.deskclock.widget.toast.SnackbarManager;



import com.google.android.material.snackbar.Snackbar;

import com.google.android.material.tabs.TabLayout;



import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING;

import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE;

import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING;
@@ -392,7 +393,7 @@ public class DeskClock extends BaseActivity 
     */

    @Override

    public void onDialogLabelSet(Alarm alarm, String label, String tag) {

        final Fragment frag = getFragmentManager().findFragmentByTag(tag);

        final Fragment frag = getSupportFragmentManager().findFragmentByTag(tag);

        if (frag instanceof AlarmClockFragment) {

            ((AlarmClockFragment) frag).setLabel(alarm, label);

        }

src/com/android/deskclock/DeskClockFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.deskclock;



import android.app.Fragment;

import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import android.view.KeyEvent;

import android.widget.Button;

import android.widget.ImageView;

import androidx.annotation.ColorInt;

import androidx.annotation.NonNull;

import androidx.fragment.app.Fragment;



import com.android.deskclock.uidata.UiDataModel;

import com.android.deskclock.uidata.UiDataModel.Tab;

src/com/android/deskclock/FragmentTabPagerAdapter.java

+11 −12
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package com.android.deskclock;



import android.app.Fragment;

import android.app.FragmentManager;

import android.app.FragmentTransaction;

import androidx.legacy.app.FragmentCompat;

import androidx.viewpager.widget.PagerAdapter;

import android.util.ArrayMap;

import android.view.View;

import android.view.ViewGroup;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.viewpager.widget.PagerAdapter;



import com.android.deskclock.uidata.UiDataModel;
@@ -55,7 +54,7 @@ final class FragmentTabPagerAdapter extends PagerAdapter { 
    FragmentTabPagerAdapter(DeskClock deskClock) {

        mDeskClock = deskClock;

        mFragmentCache = new ArrayMap<>(getCount());

        mFragmentManager = deskClock.getFragmentManager();

        mFragmentManager = deskClock.getSupportFragmentManager();

    }



    @Override
@@ -119,8 +118,8 @@ final class FragmentTabPagerAdapter extends PagerAdapter { 
        }



        if (fragment != mCurrentPrimaryItem) {

            FragmentCompat.setMenuVisibility(fragment, false);

            FragmentCompat.setUserVisibleHint(fragment, false);

            fragment.setMenuVisibility(false);

            fragment.setUserVisibleHint(false);

        }



        return fragment;
@@ -141,12 +140,12 @@ final class FragmentTabPagerAdapter extends PagerAdapter { 
        final Fragment fragment = (Fragment) object;

        if (fragment != mCurrentPrimaryItem) {

            if (mCurrentPrimaryItem != null) {

                FragmentCompat.setMenuVisibility(mCurrentPrimaryItem, false);

                FragmentCompat.setUserVisibleHint(mCurrentPrimaryItem, false);

                mCurrentPrimaryItem.setMenuVisibility(false);

                mCurrentPrimaryItem.setUserVisibleHint(false);

            }

            if (fragment != null) {

                FragmentCompat.setMenuVisibility(fragment, true);

                FragmentCompat.setUserVisibleHint(fragment, true);

                fragment.setMenuVisibility(true);

                fragment.setUserVisibleHint(true);

            }

            mCurrentPrimaryItem = fragment;

        }

src/com/android/deskclock/LabelDialogFragment.java

+7 −7
Original line number Diff line number Diff line
@@ -17,18 +17,11 @@ 
package com.android.deskclock;



import android.app.Dialog;

import android.app.DialogFragment;

import android.app.Fragment;

import android.app.FragmentManager;

import android.app.FragmentTransaction;

import android.content.Context;

import android.content.DialogInterface;

import android.content.res.ColorStateList;

import android.graphics.Color;

import android.os.Bundle;

import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.widget.AppCompatEditText;

import android.text.Editable;

import android.text.InputType;

import android.text.TextUtils;
@@ -37,6 +30,13 @@ import android.view.KeyEvent; 
import android.view.Window;

import android.view.inputmethod.EditorInfo;

import android.widget.TextView;

import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.appcompat.widget.AppCompatEditText;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;



import com.android.deskclock.data.DataModel;

import com.android.deskclock.data.Timer;