MyMainActivity

dzmanto · Sep 25, 2024 · 368b3e1 · 368b3e1
1 parent e7fe15a
commit 368b3e1
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/app/src/main/java/foehnix/widget/MyMainActivity.java b/app/src/main/java/foehnix/widget/MyMainActivity.java
@@ -1,6 +1,5 @@
 package foehnix.widget;
 
-<<<<<<< HEAD
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,12 +11,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.RequiresApi;
-=======
-import android.os.Bundle;
-import android.text.Html;
-import android.widget.TextView;
-
->>>>>>> 7a359bb00fe288fb171b1587c440cb9b40504bfb
 import androidx.appcompat.app.AppCompatActivity;
 
 @RequiresApi(api = Build.VERSION_CODES.KITKAT)
@@ -26,7 +19,6 @@ public class MyMainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-<<<<<<< HEAD
         // try strict mode to investigate leaks
         StrictMode.enableDefaults();
 
@@ -39,14 +31,8 @@ protected void onCreate(Bundle savedInstanceState) {
             throw new RuntimeException(e);
         }
 
-=======
->>>>>>> 7a359bb00fe288fb171b1587c440cb9b40504bfb
         TextView welcomeMessageTV = new TextView(this);
         welcomeMessageTV.setText(Html.fromHtml("<h2>How to install the föhnix widget<h2><ul><<li> Tap on the home screen</li><li>Select <i>widgets<</i></li><li> Select the föhnix widget from the list</li><li> Arrange the föhnix widget on the screen</li></ul>"));
         setContentView(welcomeMessageTV);
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> 7a359bb00fe288fb171b1587c440cb9b40504bfb
 }