diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-09-30 11:55:54 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-09-30 11:55:54 -0400 |
| commit | 83932c74ba031eb2f581f1557c1a90f4b5bbb423 (patch) | |
| tree | f8b87dde54bf3ead5f23c313e67c01a004d916c2 /res/anim | |
| parent | 9957024e9a4c904c83d76df03c4ebf9bdaa5f4c6 (diff) | |
| download | packages_apps_Browser-83932c74ba031eb2f581f1557c1a90f4b5bbb423.zip packages_apps_Browser-83932c74ba031eb2f581f1557c1a90f4b5bbb423.tar.gz packages_apps_Browser-83932c74ba031eb2f581f1557c1a90f4b5bbb423.tar.bz2 | |
Slide the title bar onto the screen rather than stretching it.
Fix for http://b/issue?id=2154614
Also update the header for the find dialog animations.
Change-Id: Ibf40bd9ee12c270c2794d4d2316143686a072458
Diffstat (limited to 'res/anim')
| -rw-r--r-- | res/anim/find_dialog_enter.xml | 30 | ||||
| -rw-r--r-- | res/anim/find_dialog_exit.xml | 30 | ||||
| -rw-r--r-- | res/anim/title_bar_enter.xml | 23 | ||||
| -rw-r--r-- | res/anim/title_bar_exit.xml | 22 |
4 files changed, 71 insertions, 34 deletions
diff --git a/res/anim/find_dialog_enter.xml b/res/anim/find_dialog_enter.xml index 6e19c21..5e597a4 100644 --- a/res/anim/find_dialog_enter.xml +++ b/res/anim/find_dialog_enter.xml @@ -1,21 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/anim/options_panel_enter.xml -** -** Copyright 2007, 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. -*/ +<!-- Copyright (C) 2007 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. --> <set xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/res/anim/find_dialog_exit.xml b/res/anim/find_dialog_exit.xml index 5775bab..854abd0 100644 --- a/res/anim/find_dialog_exit.xml +++ b/res/anim/find_dialog_exit.xml @@ -1,21 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/anim/options_panel_exit.xml -** -** Copyright 2007, 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. -*/ +<!-- Copyright (C) 2007 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. --> <set xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/res/anim/title_bar_enter.xml b/res/anim/title_bar_enter.xml new file mode 100644 index 0000000..ce4df1d --- /dev/null +++ b/res/anim/title_bar_enter.xml @@ -0,0 +1,23 @@ +<?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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/decelerate_interpolator"> + <translate android:fromYDelta="-25%" android:toYDelta="0" + android:duration="@android:integer/config_shortAnimTime"/> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:duration="@android:integer/config_shortAnimTime" /> +</set> diff --git a/res/anim/title_bar_exit.xml b/res/anim/title_bar_exit.xml new file mode 100644 index 0000000..b56710c --- /dev/null +++ b/res/anim/title_bar_exit.xml @@ -0,0 +1,22 @@ +<?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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/accelerate_interpolator"> + <translate android:fromYDelta="0" android:toYDelta="-50%" + android:duration="@android:integer/config_shortAnimTime"/> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:duration="@android:integer/config_shortAnimTime" /> +</set> |