summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-08-12 14:34:45 -0700
committerTyler Gunn <tgunn@google.com>2015-08-12 14:34:45 -0700
commit6510868e03604f36699e92f1a2f5f06e1ccdf726 (patch)
tree5cea95ad178d120a0f02f700c44ed72a64ebffd1 /res/values
parent6fb8c107970104b02688c3f536e6bef51cf24f88 (diff)
downloadandroid_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.tar.gz
android_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.tar.bz2
android_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.zip
Consolidate CallSubject history and dialog.
- Removed CallSubjectHistory activity and put that functionality into CallSubjectDialog. - Changed CallSubjectDialog into an activity styled after a dialog. - Although dialog_call_subject looks a lot different, the main change is the addition of the subject_list above the dialog in the layout (I tried having it below the dialog but I could not get the layout to work properly). A RelativeLayout was used so that when the subject history list is shown, the dialog naturally moves up to fit the call history list. - Added layout for the call subject history list items to give better control of their appearance. - This was to give better control of layout and make it possible to animate between show/hide of call subject history. Bug: 22685114 Change-Id: I7555bb09b86c50b52a76661f1460f4fe0e30bd97
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/integers.xml3
-rw-r--r--res/values/styles.xml19
3 files changed, 11 insertions, 13 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fd380243..8d612ff1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -159,4 +159,6 @@
<dimen name="call_subject_dialog_primary_text_size">16sp</dimen>
<!-- Size of secondary text in the call subject dialog. -->
<dimen name="call_subject_dialog_secondary_text_size">14sp</dimen>
+ <!-- Row padding for call subject history items. -->
+ <dimen name="call_subject_history_item_padding">15dp</dimen>
</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index fc1209fa..f3d1e748 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -30,4 +30,7 @@
<!-- Layout weight of card in contact list view.
Default to 0 to indicate no padding -->
<integer name="contact_list_card_layout_weight">0</integer>
+
+ <!-- Duration of the animations on the call subject dialog. -->
+ <integer name="call_subject_animation_duration">250</integer>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6ab07d3e..77c4677c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -89,25 +89,18 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar
<item name="android:windowIsFloating">true</item>
</style>
- <style name="CallSubjectDialogTheme" parent="android:Theme.Material.Light.Dialog">
- <item name="android:layout_width">fill_parent</item>
- <item name="android:layout_height">fill_parent</item>
+ <style name="Theme.CallSubjectDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
<!-- No backgrounds, titles or window float -->
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowFullscreen">true</item>
- <item name="android:windowIsFloating">true</item>
- </style>
-
- <!-- Theme used for the call subjection history selection activity. -->
- <style name="Theme.CallSubjectSelector" parent="android:Theme.Material.Light">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
+ <item name="android:windowFullscreen">false</item>
+ <item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:backgroundDimEnabled">false</item>
- <item name="android:windowTranslucentStatus">false</item>
- <item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowElevation">0dp</item>
</style>
</resources>