Merge branch 'reverted_numpad_time_picker' into timers

app/src/main/res/values/dimens.xml

@@ -25,4 +25,9 @@
     <!-- Bottom sheet specs -->
     <dimen name="bottom_sheet_edge_margin">24dp</dimen>
     <dimen name="bottom_sheet_vertical_space">16dp</dimen>
+    <dimen name="anchored_fab_vertical_space">28dp</dimen>
+    <!-- If the total height of the contents of a bottom sheet does not exceed this limit,
+    then the sheet will show fully expanded; the contents are not stretched to match this height.
+    This is large enough to accommodate most, if not all, of our layouts. -->
+    <dimen name="peek_height_upper_limit">500dp</dimen>
 </resources>

app/src/main/res/values/prefs_alarms.xml

@@ -5,11 +5,15 @@
     <!-- Time picker style -->
     <string name="key_time_picker_style">key_time_picker_style</string>
     <string name="title_time_picker_style">Time picker style</string>
-    <string name="number_pad">Number pad</string>
-    <string name="radial_clock">Radial clock</string>
+    <!-- Internally, we refer to this picker as a numpad because it's concise.
+    However, "numeric keypad" is more descriptive when describing the style to users. -->
+    <string name="number_pad">Numeric keypad</string>
+    <!--<string name="radial_clock">Radial clock</string>-->
+    <string name="grid_selector">Grid selector</string>
     <string-array name="array_time_picker_styles">
         <item>@string/number_pad</item>
-        <item>@string/radial_clock</item>
+        <!--<item>@string/radial_clock</item>-->
+        <item>@string/grid_selector</item>
     </string-array>
 
     <!-- Silence after -->

app/src/main/res/values/styles.xml

@@ -6,6 +6,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <!-- TODO: This doesn't work for BottomSheetDialogs. Verify this works for other types of dialogs. -->
+        <item name="dialogTheme">@style/AppCompatDialogTheme</item>
+        <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
@@ -57,7 +60,11 @@
     </style>
 
     <style name="Divider">
-        <item name="android:background">?android:attr/listDivider</item>
+        <!-- Won't be visible in a bottom sheet dialog... -->
+        <!--<item name="android:background">?android:attr/listDivider</item>-->
+        <!-- Extracted from the drawable pointed to by the attr. Visible in bottom sheet. -->
+        <item name="android:background">#1f000000</item> <!-- 12% black -->
+        <item name="android:tint">?android:attr/colorForeground</item>
     </style>
 
     <style name="Divider.Horizontal">
@@ -78,4 +85,17 @@
         <item name="android:focusableInTouchMode">true</item>
     </style>
 
+    <!-- Style for AppCompatDialog from the v7 support library -->
+    <style name="AppCompatDialogTheme" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">?android:attr/colorAccent</item>
+    </style>
+    
+    <style name="BottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/ModalStyle</item>
+    </style>
+
+    <style name="ModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="behavior_peekHeight">@dimen/peek_height_upper_limit</item>
+    </style>
+
 </resources>