From 9988ff81ba20abdf20dab20a6701d78fd0336354 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 29 Jun 2022 12:42:03 -0400
Subject: [PATCH] Addresses Obsolete SDK_INT version checks

---
 .../services/NotificationsUpdateJobService.java      |  2 --
 .../service/InstallationReferrerJobService.java      |  2 --
 .../main/res/layout/activity_log_list_activity.xml   |  3 +--
 .../src/main/res/values-night/styles_zendesk.xml     |  2 +-
 libs/editor/src/main/res/values/styles.xml           | 12 ++++++------
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java
index 574d97da30ee..f2ed15e62076 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/services/NotificationsUpdateJobService.java
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.notifications.services;
 
-import android.annotation.TargetApi;
 import android.app.job.JobParameters;
 import android.app.job.JobService;
 import android.content.Context;
@@ -20,7 +19,6 @@ protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(LocaleManager.setLocale(newBase));
     }
 
-    @TargetApi(22)
     @Override
     public boolean onStartJob(JobParameters params) {
         String noteId = null;
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java
index 8cc9ecc562c1..8d4d43d44f72 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerJobService.java
@@ -1,6 +1,5 @@
 package org.wordpress.android.util.analytics.service;
 
-import android.annotation.TargetApi;
 import android.app.job.JobParameters;
 import android.app.job.JobService;
 import android.os.Bundle;
@@ -19,7 +18,6 @@
  * https://developer.android.com/guide/components/broadcasts.html#receiving_broadcasts
  * https://developer.android.com/guide/components/broadcasts#effects-on-process-state
  */
-@TargetApi(21)
 public class InstallationReferrerJobService extends JobService implements
         InstallationReferrerServiceLogic.ServiceCompletionListener {
     @Override
diff --git a/WordPress/src/main/res/layout/activity_log_list_activity.xml b/WordPress/src/main/res/layout/activity_log_list_activity.xml
index 0648d351929c..42e4f5fe1480 100644
--- a/WordPress/src/main/res/layout/activity_log_list_activity.xml
+++ b/WordPress/src/main/res/layout/activity_log_list_activity.xml
@@ -30,8 +30,7 @@
             android:scrollIndicators="none"
             android:visibility="gone"
             app:layout_scrollFlags="noScroll"
-            android:scrollbars="none"
-            tools:targetApi="m">
+            android:scrollbars="none">
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/WordPress/src/main/res/values-night/styles_zendesk.xml b/WordPress/src/main/res/values-night/styles_zendesk.xml
index c9c6faf68061..e4540b72da8c 100644
--- a/WordPress/src/main/res/values-night/styles_zendesk.xml
+++ b/WordPress/src/main/res/values-night/styles_zendesk.xml
@@ -7,7 +7,7 @@
         <item name="toolbarNavigationButtonStyle">
             @style/Widget.AppCompat.Toolbar.Button.Navigation
         </item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 </resources>
diff --git a/libs/editor/src/main/res/values/styles.xml b/libs/editor/src/main/res/values/styles.xml
index f51414cb9d8b..83e5b6076627 100755
--- a/libs/editor/src/main/res/values/styles.xml
+++ b/libs/editor/src/main/res/values/styles.xml
@@ -14,13 +14,13 @@
     <style name="FormatBarButtonTablet" parent="FormatBarButton">
         <item name="android:layout_marginRight">@dimen/format_bar_button_margin_tablet</item>
         <item name="android:layout_marginLeft">@dimen/format_bar_button_margin_tablet</item>
-        <item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">@dimen/format_bar_button_margin_tablet</item>
-        <item name="android:layout_marginEnd" tools:targetApi="jelly_bean_mr1">@dimen/format_bar_button_margin_tablet</item>
+        <item name="android:layout_marginStart">@dimen/format_bar_button_margin_tablet</item>
+        <item name="android:layout_marginEnd">@dimen/format_bar_button_margin_tablet</item>
     </style>
 
     <style name="FormatBarHtmlButton" parent="FormatBarButton">
         <item name="android:layout_marginLeft">@dimen/format_bar_html_button_left_margin</item>
-        <item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">@dimen/format_bar_html_button_left_margin</item>
+        <item name="android:layout_marginStart">@dimen/format_bar_html_button_left_margin</item>
     </style>
 
     <style name="Divider">
@@ -34,15 +34,15 @@
     <style name="FormatBarTabletGroup">
         <item name="android:layout_marginLeft">@dimen/format_bar_button_group_tablet</item>
         <item name="android:layout_marginRight">@dimen/format_bar_button_group_tablet</item>
-        <item name="android:layout_marginStart" tools:targetApi="jelly_bean_mr1">@dimen/format_bar_button_group_tablet</item>
-        <item name="android:layout_marginEnd" tools:targetApi="jelly_bean_mr1">@dimen/format_bar_button_group_tablet</item>
+        <item name="android:layout_marginStart">@dimen/format_bar_button_group_tablet</item>
+        <item name="android:layout_marginEnd">@dimen/format_bar_button_group_tablet</item>
     </style>
 
     <style name="ImageOptionsDialogLabel">
         <item name="android:textColor">@color/image_options_label</item>
         <item name="android:textStyle">bold</item>
         <item name="android:paddingLeft">@dimen/image_settings_dialog_label_indent</item>
-        <item name="android:paddingStart" tools:targetApi="jelly_bean_mr1">@dimen/image_settings_dialog_label_indent</item>
+        <item name="android:paddingStart">@dimen/image_settings_dialog_label_indent</item>
         <item name="android:layout_marginBottom">@dimen/image_settings_dialog_label_margin_bottom</item>
     </style>