diff options
author | sail <sail@google.com> | 2017-09-03 13:57:22 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-09-11 09:09:35 -0700 |
commit | 3bcea98f1e6d63e22a7b5393b31c2195d3db82b4 (patch) | |
tree | 848d8f8b33da563f4a5f7b40c553d7adb227744d /java/com/android/bubble/res/color | |
parent | 2cb0136378f1e2930b81399da1bd606dc478e0b3 (diff) |
Switch Dialer to use new third_party bubble library
This CL switches Dialer to use the new common bubble libary. It also moves the
integration tests into the bubble libary.
Bug: 64797730
Test: BubbleIntegrationTest
PiperOrigin-RevId: 167439680
Change-Id: Ie2e9367cb6a6561efb8abd425b6a12f8c1e78138
Diffstat (limited to 'java/com/android/bubble/res/color')
-rw-r--r-- | java/com/android/bubble/res/color/bubble_checkable_mask.xml | 21 | ||||
-rw-r--r-- | java/com/android/bubble/res/color/bubble_icon_tint_states.xml | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/java/com/android/bubble/res/color/bubble_checkable_mask.xml b/java/com/android/bubble/res/color/bubble_checkable_mask.xml new file mode 100644 index 000000000..f9416ab57 --- /dev/null +++ b/java/com/android/bubble/res/color/bubble_checkable_mask.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="@android:color/white" android:state_checked="true"/> + <item android:color="@android:color/transparent"/> +</selector> diff --git a/java/com/android/bubble/res/color/bubble_icon_tint_states.xml b/java/com/android/bubble/res/color/bubble_icon_tint_states.xml new file mode 100644 index 000000000..33ca1fdc5 --- /dev/null +++ b/java/com/android/bubble/res/color/bubble_icon_tint_states.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2017 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 + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:color="#80FFFFFF" android:state_enabled="false"/> + <item android:color="@android:color/white"/> +</selector> |