ui: user proper action bar height

Issue: #78218
Change-Id: I5c50cbaead11fd5e7acdf393269878d6ec12c5f6

ring-android/app/src/main/java/cx/ring/client/HomeActivity.java

@@ -109,6 +109,7 @@ public class HomeActivity extends AppCompatActivity implements LocalService.Call
     private DrawerLayout mNavigationDrawer;
     private ActionBarDrawerToggle mDrawerToggle;
     private Toolbar toolbar;
+    private float mToolbarSize;
     private FloatingActionButton actionButton;
 
     private boolean isClosing = false;
@@ -142,6 +143,8 @@ public class HomeActivity extends AppCompatActivity implements LocalService.Call
     public void onCreate(Bundle savedInstanceState) {
         setDefaultUncaughtExceptionHandler();
 
+        mToolbarSize = getResources().getDimension(R.dimen.abc_action_bar_default_height_material);
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
 
@@ -268,27 +271,17 @@ public class HomeActivity extends AppCompatActivity implements LocalService.Call
     }
 
     public void setToolbarState(boolean double_h, int title_res) {
-        TypedValue tv = new TypedValue();
-        if (getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
-            int abSz = TypedValue.complexToDimensionPixelSize(tv.data,getResources().getDisplayMetrics());
-            ViewGroup.LayoutParams params = toolbar.getLayoutParams();//toolbar.setContentInsetsRelative();
-
-            //TypedArray a = obtainStyledAttributes(attrs, R.styleable.Toolbar_titleMarginBottom);
-
-            //toolbar.get
-            if (double_h) {
-                params.height = abSz*2;
-                actionButton.setVisibility(View.VISIBLE);
-            }
-            else {
-                params.height = abSz;
-                actionButton.setVisibility(View.GONE);
-            }
-            toolbar.setLayoutParams(params);
-            toolbar.setMinimumHeight(abSz);
+        ViewGroup.LayoutParams params = toolbar.getLayoutParams();
+        if (double_h) {
+            params.height = (int) (mToolbarSize * 2);
+            actionButton.setVisibility(View.VISIBLE);
+        } else {
+            params.height = (int) mToolbarSize;
+            actionButton.setVisibility(View.GONE);
         }
+        toolbar.setLayoutParams(params);
+        toolbar.setMinimumHeight((int) mToolbarSize);
         toolbar.setTitle(title_res);
-        //toolbar.setTitleTextAppearance(toolbar.getT);
     }
 
     public FloatingActionButton getActionButton() {

ring-android/app/src/main/res/values-land/dimens.xml

@@ -31,6 +31,6 @@ as that of the covered work.
 -->
 <resources>
 
-    <dimen name="action_bar_title_margin_bottom">10dp</dimen>
+    <dimen name="action_bar_title_margin_bottom">12dp</dimen>
 
 </resources>
\ No newline at end of file

ring-android/app/src/main/res/values/dimens.xml

@@ -55,6 +55,6 @@ as that of the covered work.
     <dimen name="action_button_bpadding">-35dp</dimen>
     <dimen name="fab_compat_margin">0dp</dimen>
 
-    <dimen name="action_bar_title_margin_bottom">12dp</dimen>
+    <dimen name="action_bar_title_margin_bottom">16dp</dimen>
 
 </resources>
\ No newline at end of file

ring-android/app/src/main/res/values/styles.xml

@@ -20,18 +20,30 @@
     </style>
 
     <style name="AppThemeWithoutOverlay" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+        <item name="colorAccent">@color/color_primary_dark</item>
+        <item name="colorPrimary">@color/color_primary_light</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="android:actionBarStyle">@style/NativeActionBar</item>
+    </style>
+
+    <style name="AppThemeWithoutOverlayCompat" parent="style/Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorAccent">@color/color_primary_dark</item>
+        <item name="colorPrimary">@color/color_primary_light</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
         <item name="android:actionBarStyle">@style/NativeActionBar</item>
     </style>
 
     <style name="NativeActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid.Inverse">
         <item name="android:background">@color/color_primary_light</item>
+        <item name="android:height">@dimen/abc_action_bar_default_height_material</item>
         <item name="elevation">4dp</item>
     </style>
 
     <style name="MyActionBar" parent="@style/Widget.AppCompat.ActionBar.Solid">
-        <item name="android:textColorPrimary">@android:color/primary_text_dark</item>
-        <item name="android:textColorHighlight">@android:color/primary_text_dark</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_dark</item>
+        <item name="android:height">@dimen/abc_action_bar_default_height_material</item>
+        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
+        <item name="android:textColorHighlight">@color/text_color_primary_dark</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="selectableItemBackground">?android:selectableItemBackground</item>
         <item name="selectableItemBackgroundBorderless">?android:selectableItemBackground</item>
@@ -44,26 +56,26 @@
     </style>
 
     <style name="MenuHeader" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:textColorPrimary">@android:color/primary_text_dark</item>
-        <item name="android:textColorSecondary">@android:color/secondary_text_dark</item>
+        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
     </style>
 
     <style name="Subheader">
         <item name="android:textSize">14sp</item>
         <item name="android:typeface">normal</item>
-        <item name="android:textColor">@android:color/tertiary_text_light</item>
+        <item name="android:textColor">@color/text_color_secondary</item>
     </style>
 
     <style name="ListPrimary">
         <item name="android:textSize">16sp</item>
         <item name="android:typeface">normal</item>
-        <item name="android:textColor">@android:color/primary_text_light</item>
+        <item name="android:textColor">@color/text_color_primary</item>
     </style>
 
     <style name="ListSecondary">
         <item name="android:textSize">14sp</item>
         <item name="android:typeface">normal</item>
-        <item name="android:textColor">@android:color/tertiary_text_light</item>
+        <item name="android:textColor">@color/text_color_secondary</item>
     </style>
 
 </resources>
\ No newline at end of file