Revert to include fragment_recycler_view in Fragment layouts, programmatically set padding as needed. Replace hardcoded dimens with dimen resources.

app/src/main/java/com/philliphsu/clock2/editalarm/NumberGridTimePickerDialog.java

@@ -46,6 +46,8 @@ import java.util.Locale;
 import butterknife.Bind;
 import butterknife.OnClick;
 
+import static com.philliphsu.clock2.util.ConfigurationUtils.getOrientation;
+
 //import com.android.datetimepicker.HapticFeedbackController;
 //import com.android.datetimepicker.R;
 //import com.android.datetimepicker.Utils;
@@ -326,7 +328,7 @@ public class NumberGridTimePickerDialog extends BaseTimePickerDialog implements
             final int icon2 = mThemeDark? R.drawable.ic_half_day_2_dark_24dp : R.drawable.ic_half_day_2_24dp;
             // Determine the direction the icons should be in
             int left1 = 0, left2 = 0, top1 = 0, top2 = 0;
-            switch (getResources().getConfiguration().orientation) {
+            switch (getOrientation(getResources())) {
                 case Configuration.ORIENTATION_PORTRAIT:
                     left1 = icon1;
                     left2 = icon2;

app/src/main/java/com/philliphsu/clock2/editalarm/TwentyFourHourGridItem.java

@@ -9,6 +9,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.philliphsu.clock2.R;
+import com.philliphsu.clock2.util.ConfigurationUtils;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -70,7 +71,8 @@ public class TwentyFourHourGridItem extends LinearLayout {
     }
 
     private void init() {
-        final int orientation = getResources().getConfiguration().orientation;
+        // TODO: Why isn't ALT-ENTER giving us an option to static import this method?
+        final int orientation = ConfigurationUtils.getOrientation(getResources());
         setOrientation(orientation == Configuration.ORIENTATION_PORTRAIT ?
                 VERTICAL : /*LANDSCAPE*/HORIZONTAL);
         setGravity(Gravity.CENTER);