diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-22 18:11:31 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-08-22 18:43:15 -0700 |
commit | cb6f599ecb7c30e00ed8b07c5c10505322aae89c (patch) | |
tree | c2fa1ea5cee3cc72124d17c0102c1d3f68db6262 /res/values/styles.xml | |
parent | a8b5c8f943c55619141cca0f82968ae575df5992 (diff) | |
download | packages_apps_InCallUI-cb6f599ecb7c30e00ed8b07c5c10505322aae89c.tar.gz packages_apps_InCallUI-cb6f599ecb7c30e00ed8b07c5c10505322aae89c.tar.bz2 packages_apps_InCallUI-cb6f599ecb7c30e00ed8b07c5c10505322aae89c.zip |
Move "manage conference calls" button above photo.
- Remove it from the CallButtonFragment. This meant that related
logic was removed from CallButtonFragment/Presenter, and similar
logic was added to the CallCardFragment/Presenter.
- Delete old groups icons. (new ones added in ContactsCommon)
- Delete the extra_button_row logic.
+ Replace extra_button_row with a dedicated "manage conference
calls" button, and added to call card content layouts.
+ Style the new button to be similar to the secondary call info.
Bug: 15862303
Change-Id: I2b4e1a3a30422c7d5e9c01479f13291a785d85f3
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r-- | res/values/styles.xml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 06aeb873..f49cee91 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -70,27 +70,6 @@ <item name="android:textOff">@null</item> </style> - <!-- Buttons in extra button row. --> - <style name="InCallExtraRowButton"> - <item name="android:layout_width">@dimen/extra_row_button_width</item> - <item name="android:layout_height">@dimen/extra_row_button_height</item> - <item name="android:background">@null</item> - </style> - - <!-- Text label drawn alongside buttons in the "extra button row" of - the in-call onscreen touch UI. --> - <style name="InCallExtraRowButtonLabel"> - <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> - <item name="android:textColor">@color/incall_call_banner_text_color</item> - <item name="android:textAllCaps">true</item> - <item name="android:textStyle">bold</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center_vertical</item> - <item name="android:layout_marginStart">5dip</item> - <item name="android:layout_marginEnd">5dip</item> - </style> - <style name="InCallAnimationStyle" parent="@android:style/Animation.Activity"> <!-- Suppress task-to-task animation happening during the transition from OutgoingCallBroadcaster (and SipOptionHandler) to InCallActivity. |