diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-03-16 17:20:07 -0700 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:29:35 -0700 |
| commit | 25cd7bfe66534ee3dbf1aad7ca646bec3b6c702a (patch) | |
| tree | 34f0dd79026dbb0b9a5b46dde398a102e8d56421 /res | |
| parent | a5eb044a064d9798ecf5a8112b3f5bc543ff414b (diff) | |
| download | android_packages_apps_InCallUI-25cd7bfe66534ee3dbf1aad7ca646bec3b6c702a.tar.gz android_packages_apps_InCallUI-25cd7bfe66534ee3dbf1aad7ca646bec3b6c702a.tar.bz2 android_packages_apps_InCallUI-25cd7bfe66534ee3dbf1aad7ca646bec3b6c702a.zip | |
Temporarily revert DeepLink
Revert "Resolves a few issues related to call buttons: The DeepLink slot will"
This reverts commit ae95d93516b3b7f0d709cddc2cdff6753dba513a.
Revert "Resolves a NPE when the UI isn't available at the time of the callback"
This reverts commit d740995d19e48aff2b2ae9252248badc52cc65c4.
Revert "Tints the DeepLink icons loaded into the callbuttonfragment to keep"
This reverts commit 05f12d3cf9383d119ab2ceb228d2e39b3518af23.
Revert "DeepLink Refactors for CallButtonPresenter and CallButtonFragment"
This reverts commit 1110623527c8f09e604acdc09f9ea31f46938e00.
Revert "DeepLink integration phase 1"
This reverts commit 824ac83c2076352e459a42f608e1d1fb75d4772f.
Change-Id: If0d995e84b79ab76d16ecc5c9e61a89463508b34
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_button_fragment.xml | 5 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 3 | ||||
| -rw-r--r-- | res/values/config.xml | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml index 346b46b8..1842d88b 100644 --- a/res/layout/call_button_fragment.xml +++ b/res/layout/call_button_fragment.xml @@ -110,11 +110,6 @@ android:contentDescription="@string/onscreenVideoCallText" android:visibility="gone" /> - <ImageButton android:id="@+id/takeNoteButton" - style="@style/InCallButton" - android:contentDescription="@string/onscreenNoteText" - android:visibility="gone" /> - <!-- "Switch camera" for video calls. --> <ToggleButton android:id="@+id/switchCameraButton" style="@style/InCallCompoundButton" diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 3cf32f1b..c988d8e8 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -33,9 +33,6 @@ provider (e.g. MSIM) --> <string name="card_title_active_via_template"><xliff:g id="status" example="Call on hold">%1$s</xliff:g> (via <xliff:g id="provider_name">%2$s</xliff:g>)</string> - <!-- In Call Screen: take a note from an active call --> - <string name="onscreenNoteText">Take Note</string> - <!-- In-call screen: status label for a call that is held remotely --> <string name="card_title_waiting_call">Call on hold</string> diff --git a/res/values/config.xml b/res/values/config.xml index d4eba6b2..b81ba3ca 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -16,7 +16,7 @@ <resources> <!-- Determines the maximum number of buttons visible on the call card. Any buttons over this count are put into the overflow menu. --> - <integer name="call_card_max_buttons">6</integer> + <integer name="call_card_max_buttons">5</integer> <!-- Determines video calls will automatically enter fullscreen mode after the start of the call. --> |