diff options
| author | Adam Cohen <adamcohen@google.com> | 2015-04-06 13:11:28 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2015-04-06 13:11:38 -0700 |
| commit | 2e52c90b3ff0a04bd734aa19c54c39cef186b653 (patch) | |
| tree | 3f1417cdd5fd40f79d1e630e6483dd528763ea94 /res | |
| parent | b5352011e6e890769454ab3335d88f5b3f19d498 (diff) | |
| download | android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.tar.gz android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.tar.bz2 android_packages_apps_Trebuchet-2e52c90b3ff0a04bd734aa19c54c39cef186b653.zip | |
resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby
Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252
Diffstat (limited to 'res')
| -rw-r--r-- | res/anim/fade_in_fast.xml | 23 | ||||
| -rw-r--r-- | res/anim/fade_out_fast.xml | 23 | ||||
| -rw-r--r-- | res/anim/no_anim.xml | 18 |
3 files changed, 0 insertions, 64 deletions
diff --git a/res/anim/fade_in_fast.xml b/res/anim/fade_in_fast.xml deleted file mode 100644 index 4fa9847aa..000000000 --- a/res/anim/fade_in_fast.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" - - android:fromAlpha="0.0" - android:toAlpha="1.0" - - android:duration="@android:integer/config_mediumAnimTime" /> diff --git a/res/anim/fade_out_fast.xml b/res/anim/fade_out_fast.xml deleted file mode 100644 index a061a6ca9..000000000 --- a/res/anim/fade_out_fast.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" - - android:fromAlpha="1.0" - android:toAlpha="0.0" - - android:duration="@android:integer/config_mediumAnimTime" /> diff --git a/res/anim/no_anim.xml b/res/anim/no_anim.xml deleted file mode 100644 index 02b162519..000000000 --- a/res/anim/no_anim.xml +++ /dev/null @@ -1,18 +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. ---> - -<alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:duration="417" /> |