Merge "Don't show PII in logs for JSON-encoded uris" into klp-dev
diff --git a/res/drawable-hdpi/ic_menu_dialpad_dk.png b/res/drawable-hdpi/ic_menu_dialpad_dk.png
index 984d6fa..55f5477 100644
--- a/res/drawable-hdpi/ic_menu_dialpad_dk.png
+++ b/res/drawable-hdpi/ic_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_dialpad_dk.png b/res/drawable-mdpi/ic_menu_dialpad_dk.png
index c55571a..a7dcd24 100644
--- a/res/drawable-mdpi/ic_menu_dialpad_dk.png
+++ b/res/drawable-mdpi/ic_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_dialpad_dk.png b/res/drawable-xhdpi/ic_menu_dialpad_dk.png
index 74a7032..bd80859 100644
--- a/res/drawable-xhdpi/ic_menu_dialpad_dk.png
+++ b/res/drawable-xhdpi/ic_menu_dialpad_dk.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png
index de9387d..09cc2f8 100644
--- a/res/drawable-xxhdpi/ic_menu_dialpad_dk.png
+++ b/res/drawable-xxhdpi/ic_menu_dialpad_dk.png
Binary files differ
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml
index dc28352..32b1d60 100644
--- a/res/layout/dialpad_fragment.xml
+++ b/res/layout/dialpad_fragment.xml
@@ -41,7 +41,7 @@
android:id="@+id/digits_container"
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="@integer/dialpad_layout_weight_digits_new"
+ android:layout_weight="@integer/dialpad_layout_weight_digits"
android:layout_marginTop="@dimen/dialpad_vertical_margin"
android:gravity="center" >
@@ -81,8 +81,7 @@
<LinearLayout
android:id="@+id/dialButtonContainer"
android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
+ android:layout_height="@dimen/fake_action_bar_height"
android:layout_gravity="center_horizontal"
android:background="@color/dialpad_primary_text_color"
android:layoutDirection="locale">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 30adc43..e4e847c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -47,10 +47,8 @@
<!-- Layout weight values for dialpad screen. These layouts will be used in one
LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
ratio. -->
- <integer name="dialpad_layout_weight_digits">20</integer>
- <integer name="dialpad_layout_weight_digits_new">15</integer>
+ <integer name="dialpad_layout_weight_digits">15</integer>
<integer name="dialpad_layout_weight_dialpad">65</integer>
- <integer name="dialpad_layout_weight_additional_buttons">15</integer>
<!-- Text dimensions for dialpad keys -->
<dimen name="dialpad_key_numbers_size">40dp</dimen>
@@ -60,7 +58,7 @@
<dimen name="dialpad_key_letters_width">41dp</dimen>
- <dimen name="fake_action_bar_height">48dp</dimen>
+ <dimen name="fake_action_bar_height">60dp</dimen>
<!-- Min with of fake menu buttons, which should be same as ActionBar's one -->
<dimen name="fake_menu_button_min_width">56dp</dimen>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 42cbbf4..82d5c3f 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -144,6 +144,7 @@
// Padding view used to shift the fragments up when the dialpad is shown.
private View mBottomPaddingView;
private View mFragmentsFrame;
+ private View mActionBar;
private boolean mInDialpadSearch;
private boolean mInRegularSearch;
@@ -302,6 +303,7 @@
mBottomPaddingView = findViewById(R.id.dialtacts_bottom_padding);
mFragmentsFrame = findViewById(R.id.dialtacts_frame);
+ mActionBar = findViewById(R.id.fake_action_bar);
prepareSearchView();
if (UI.FILTER_CONTACTS_ACTION.equals(intent.getAction())
@@ -547,11 +549,13 @@
@Override
public void onAnimationEnd(Animator animation) {
mBottomPaddingView.setVisibility(View.VISIBLE);
- mFragmentsFrame.setTranslationY(0);
+ mFragmentsFrame.setTranslationY(0);
+ mActionBar.setVisibility(View.INVISIBLE);
}
});
} else {
mSearchViewContainer.setTranslationY(-mSearchView.getHeight());
+ mActionBar.setVisibility(View.INVISIBLE);
}
}
@@ -564,6 +568,7 @@
@Override
public void onAnimationStart(Animator animation) {
mSearchViewContainer.setVisibility(View.VISIBLE);
+ mActionBar.setVisibility(View.VISIBLE);
}
});
