summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-04-10 17:52:04 -0700
committerYorke Lee <yorkelee@google.com>2015-04-13 14:04:49 -0700
commited0775d4fcb79868b5e86456bc757ca5f0158d91 (patch)
tree90fe118e2e45a6807667cb51d2fb19546fd8cf8f /res/menu
parent4f2a70bd6670c406ee3507b28da938108e79b06e (diff)
downloadpackages_apps_InCallUI-ed0775d4fcb79868b5e86456bc757ca5f0158d91.tar.gz
packages_apps_InCallUI-ed0775d4fcb79868b5e86456bc757ca5f0158d91.tar.bz2
packages_apps_InCallUI-ed0775d4fcb79868b5e86456bc757ca5f0158d91.zip
Simplify and rewire in-call buttons
* Fix bug where the switch camera option was never shown * Fix bug where dialpad button was shown for video calls * Move management of call button's actual visiblity into the CallCardFragment. The CallCardPresenter is in charge of deciding what functionality is available, but the CallCardFragment manages the actual UI that is displayed. * Simplify code that collapses call button functionality into the overflow button. Any buttons that would cause the total number of buttons to exceed the given threshold will be collapsed into an overflow menu. * Dynamically toggle the contentDescription of the hold button. This is used for both accessibility as well as generating the menu option if the button is collapsed into the overflow menu * Removed some now unused strings and code. Bug: 20127747 Bug: 20127925 Bug: 20090502 Change-Id: I33fda7ad74af926d8c3a507bff8f3c69c19ea57e
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/incall_overflow_menu.xml36
1 files changed, 0 insertions, 36 deletions
diff --git a/res/menu/incall_overflow_menu.xml b/res/menu/incall_overflow_menu.xml
deleted file mode 100644
index 2de85871..00000000
--- a/res/menu/incall_overflow_menu.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2014 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/overflow_merge_menu_item"
- android:title="@string/overflowMergeMenuItemText" />
-
- <item android:id="@+id/overflow_add_menu_item"
- android:title="@string/overflowAddMenuItemText" />
-
- <item android:id="@+id/overflow_hold_menu_item"
- android:title="@string/overflowHoldMenuItemText" />
-
- <item android:id="@+id/overflow_resume_menu_item"
- android:title="@string/overflowResumeMenuItemText" />
-
- <item android:id="@+id/overflow_swap_menu_item"
- android:title="@string/overflowSwapMenuItemText" />
-
- <item android:id="@+id/overflow_manage_conference_menu_item"
- android:title="@string/overflowManageConferenceMenuItemText" />
-</menu>