Merge remote-tracking branch 'github/main' into main

jdkoren · jdkoren · commit 3cc878cbe5a6 · 2022-10-31T12:52:24.000-07:00
Change-Id: I2f01716dc10fe48d16cd0bf8bc94dbe723212fa4
diff --git a/DirectBoot/Application/build.gradle b/DirectBoot/Application/build.gradle
@@ -20,14 +20,14 @@ repositories {
 dependencies {
 
 
-        implementation "com.android.support:support-v4:28.0.0"
-        implementation "com.android.support:support-v13:28.0.0"
-        implementation "com.android.support:cardview-v7:28.0.0"
-        implementation "com.android.support:appcompat-v7:28.0.0"
+        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+        implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+        implementation 'androidx.cardview:cardview:1.0.0'
+        implementation 'androidx.appcompat:appcompat:1.0.0'
 
 
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
 
 
@@ -43,11 +43,11 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 28
+        targetSdkVersion 31
     }
 
     compileOptions {
diff --git a/DirectBoot/Application/src/main/AndroidManifest.xml b/DirectBoot/Application/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
     android:versionName="1.0">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <application
         android:allowBackup="true"
@@ -31,6 +32,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:exported="true"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/BootBroadcastReceiver.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/BootBroadcastReceiver.java
@@ -23,8 +23,8 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.os.BuildCompat;
-import android.support.v4.os.UserManagerCompat;
+import androidx.core.os.BuildCompat;
+import androidx.core.os.UserManagerCompat;
 import android.util.Log;
 
 /**
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/MainActivity.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/MainActivity.java
@@ -17,7 +17,7 @@
 package com.example.android.directboot;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Launcher Activity for the Direct Boot sample app.
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/SchedulerFragment.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/SchedulerFragment.java
@@ -21,24 +21,25 @@
 import com.example.android.directboot.alarms.AlarmIntentService;
 import com.example.android.directboot.alarms.AlarmStorage;
 import com.example.android.directboot.alarms.AlarmUtil;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Fragment that registers scheduled alarms.
  */
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/TimePickerFragment.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/TimePickerFragment.java
@@ -21,15 +21,16 @@
 import com.example.android.directboot.alarms.AlarmUtil;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
 import java.util.Calendar;
 
 /**
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/Alarm.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/Alarm.java
@@ -16,10 +16,11 @@
 
 package com.example.android.directboot.alarms;
 
+import androidx.annotation.NonNull;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.support.annotation.NonNull;
 
 import java.util.Calendar;
 import java.util.Objects;
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmAdapter.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmAdapter.java
@@ -18,18 +18,20 @@
 
 import com.example.android.directboot.R;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.v7.util.SortedList;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SortedList;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -67,7 +69,7 @@ public AlarmViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     }
 
     @Override
-    public void onBindViewHolder(AlarmViewHolder holder, final int position) {
+    public void onBindViewHolder(final AlarmViewHolder holder, final int position) {
         Alarm alarm = mAlarmList.get(position);
         Calendar alarmTime = Calendar.getInstance();
         alarmTime.set(Calendar.MONTH, alarm.month);
@@ -78,11 +80,13 @@ public void onBindViewHolder(AlarmViewHolder holder, final int position) {
                 .setText(mTimeFormat.format(alarmTime.getTime()));
         holder.mAlarmDateTextView
                 .setText(mDateFormat.format(alarmTime.getTime()));
+
         holder.mDeleteImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Alarm toBeDeleted = mAlarmList.get(position);
-                mAlarmList.removeItemAt(position);
+                final int lastPosition = holder.getAdapterPosition();
+                Alarm toBeDeleted = mAlarmList.get(lastPosition);
+                mAlarmList.removeItemAt(lastPosition);
                 mAlarmStorage.deleteAlarm(toBeDeleted);
                 mAlarmUtil.cancelAlarm(toBeDeleted);
                 notifyDataSetChanged();
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmIntentService.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmIntentService.java
@@ -24,8 +24,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.core.app.NotificationCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 /**
  * IntentService to set off an alarm.
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmStorage.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmStorage.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.v4.os.BuildCompat;
+import androidx.core.os.BuildCompat;
 import android.util.Log;
 
 import java.security.SecureRandom;
diff --git a/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmUtil.java b/DirectBoot/Application/src/main/java/com/example/android/directboot/alarms/AlarmUtil.java
@@ -16,6 +16,8 @@
 
 package com.example.android.directboot.alarms;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -50,7 +52,7 @@ public void scheduleAlarm(Alarm alarm) {
         intent.putExtras(extras);
 
         PendingIntent pendingIntent = PendingIntent
-            .getService(mContext, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            .getService(mContext, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT| FLAG_IMMUTABLE);
         Calendar alarmTime = Calendar.getInstance();
         alarmTime.set(Calendar.MONTH, alarm.month);
         alarmTime.set(Calendar.DATE, alarm.date);
@@ -76,7 +78,7 @@ public void scheduleAlarm(Alarm alarm) {
     public void cancelAlarm(Alarm alarm) {
         Intent intent = new Intent(mContext, AlarmIntentService.class);
         PendingIntent pendingIntent = PendingIntent
-            .getService(mContext, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            .getService(mContext, alarm.id, intent, PendingIntent.FLAG_UPDATE_CURRENT| FLAG_IMMUTABLE);
         mAlarmManager.cancel(pendingIntent);
     }
 
diff --git a/DirectBoot/Application/src/main/res/layout/fragment_alarm_scheduler.xml b/DirectBoot/Application/src/main/res/layout/fragment_alarm_scheduler.xml
@@ -39,14 +39,14 @@
         android:visibility="gone"
         />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view_alarms"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/text_intro_message"
         />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab_add_alarm"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/DirectBoot/gradle.properties b/DirectBoot/gradle.properties
@@ -18,3 +18,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/FileLocker/app/src/main/java/com/android/example/filelocker/ListFragment.kt b/FileLocker/app/src/main/java/com/android/example/filelocker/ListFragment.kt
@@ -51,7 +51,7 @@ class ListFragment : Fragment(), NoteAdapter.NoteAdapterListener {
         binding.recyclerView.adapter = adapter
 
         // Observe this app's files directory to be displayed as a list.
-        DirectoryLiveData(requireContext().filesDir).observe(this@ListFragment) { newList ->
+        DirectoryLiveData(requireContext().filesDir).observe(viewLifecycleOwner) { newList ->
             adapter.submitList(newList)
         }
     }
