Revert example app changes

Author: emawby

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/activity/MainActivity.java

@@ -2,7 +2,6 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.view.WindowManager;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -20,21 +19,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity_layout);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
             getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         }
 
-        getWindow().getDecorView().setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_IMMERSIVE
-                        // Set the content to appear under the system bars so that the
-                        // content doesn't resize when the system bars hide and show.
-                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        // Hide the nav bar and status bar
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN);
-
         viewModel = new MainActivityViewModel();
         OneSignal.addPermissionObserver(viewModel);
         OneSignal.addSubscriptionObserver(viewModel);

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -177,8 +177,8 @@ public ActivityViewModel onActivityCreated(Context context) {
         recyclerViewBuilder = new RecyclerViewBuilder(context);
         toaster = new Toaster(context);
 
-//        appBarLayout = getActivity().findViewById(R.id.main_activity_app_bar_layout);
-//        toolbar = getActivity().findViewById(R.id.main_activity_toolbar);
+        appBarLayout = getActivity().findViewById(R.id.main_activity_app_bar_layout);
+        toolbar = getActivity().findViewById(R.id.main_activity_toolbar);
         privacyConsentLinearLayout = getActivity().findViewById(R.id.main_activity_privacy_consent_linear_layout);
         nestedScrollView = getActivity().findViewById(R.id.main_activity_nested_scroll_view);
 
@@ -301,8 +301,8 @@ public ActivityViewModel setupInterfaceElements() {
 
     @Override
     public void setupToolbar() {
-//        toolbar.setTitle(Text.EMPTY);
-//        getAppCompatActivity().setSupportActionBar(toolbar);
+        toolbar.setTitle(Text.EMPTY);
+        getAppCompatActivity().setSupportActionBar(toolbar);
     }
 
     @Override
@@ -342,7 +342,7 @@ private void setupConsentLayout(boolean hasConsent) {
         int scrollVisibility = hasConsent ? View.VISIBLE : View.GONE;
         privacyConsentLinearLayout.setVisibility(consentVisibility);
         nestedScrollView.setVisibility(scrollVisibility);
-//        appBarLayout.setExpanded(true);
+        appBarLayout.setExpanded(true);
 
         privacyConsentAllowButton.setOnClickListener(v -> {
             togglePrivacyConsent(true);
@@ -738,7 +738,7 @@ public boolean scrollToTopIfAvailable() {
         if (shouldScrollTop) {
             if (nestedScrollView != null) {
                 nestedScrollView.smoothScrollTo(0, 0);
-//                appBarLayout.setExpanded(true);
+                appBarLayout.setExpanded(true);
             }
         }
         return shouldScrollTop;
@@ -759,7 +759,7 @@ private void togglePrivacyConsent(boolean hasConsent) {
         privacyConsentLinearLayout.setVisibility(consentVisibility);
         nestedScrollView.setVisibility(scrollVisibility);
 
-//        appBarLayout.setExpanded(true);
+        appBarLayout.setExpanded(true);
     }
 
 }