diff options
author | Evan Charlton <evanc@google.com> | 2014-05-15 16:02:21 -0700 |
---|---|---|
committer | Evan Charlton <evanc@google.com> | 2014-05-15 16:22:56 -0700 |
commit | 8aac1a358f2caf6c21c603bae9c9d4bd075eb155 (patch) | |
tree | 3baa868a0552d36d8d74bdaf2e1a5cfddd2212a1 /InCallUI/res/drawable | |
parent | 8ef5cf3987ab9f7988d0ce7b033270095e05481d (diff) | |
parent | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 (diff) |
Merge remote-tracking branch 'goog/master-nova' into merge
Conflicts:
res/layout/call_card.xml
res/values-da/strings.xml
res/values-hi/strings.xml
src/com/android/incallui/CallButtonPresenter.java
src/com/android/incallui/CallCardFragment.java
src/com/android/incallui/CallCardPresenter.java
src/com/android/incallui/DialpadFragment.java
Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462
Diffstat (limited to 'InCallUI/res/drawable')
4 files changed, 108 insertions, 0 deletions
diff --git a/InCallUI/res/drawable/floating_handoff_button_active_background.xml b/InCallUI/res/drawable/floating_handoff_button_active_background.xml new file mode 100644 index 000000000..f06e8416b --- /dev/null +++ b/InCallUI/res/drawable/floating_handoff_button_active_background.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + <corners + android:radius="@dimen/floating_action_button_radius" /> + <size + android:width="@dimen/floating_action_button_width" + android:height="@dimen/floating_action_button_height" /> + <solid + android:color="@color/handoff_call_active_color" /> +</shape> diff --git a/InCallUI/res/drawable/floating_handoff_button_compound_background.xml b/InCallUI/res/drawable/floating_handoff_button_compound_background.xml new file mode 100644 index 000000000..00ee7913a --- /dev/null +++ b/InCallUI/res/drawable/floating_handoff_button_compound_background.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<!-- Background drawable used to render the floating circular "end call" button. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:drawable="@drawable/floating_handoff_button_disabled_background" /> + <item android:state_pressed="true" + android:drawable="@drawable/floating_handoff_button_pressed_background" /> + <item android:drawable="@drawable/floating_handoff_button_active_background" /> +</selector> diff --git a/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml new file mode 100644 index 000000000..68d64b8e0 --- /dev/null +++ b/InCallUI/res/drawable/floating_handoff_button_disabled_background.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + <corners + android:radius="@dimen/floating_action_button_radius" /> + <size + android:width="@dimen/floating_action_button_width" + android:height="@dimen/floating_action_button_height" /> + <solid + android:color="@color/handoff_call_disabled_color" /> +</shape> diff --git a/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml b/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml new file mode 100644 index 000000000..54a046973 --- /dev/null +++ b/InCallUI/res/drawable/floating_handoff_button_pressed_background.xml @@ -0,0 +1,28 @@ +<?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. +--> + +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + <corners + android:radius="@dimen/floating_action_button_radius" /> + <size + android:width="@dimen/floating_action_button_width" + android:height="@dimen/floating_action_button_height" /> + <solid + android:color="@color/handoff_call_pressed_color" /> +</shape> |