diff options
| author | Ravi Banuri <ravibanuri@codeaurora.org> | 2015-10-19 16:03:03 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-08 22:55:05 -0800 |
| commit | 7a41c376e299d9944a956004c5176b31a5ef0a4e (patch) | |
| tree | d11d9e09ca81fed337fdf5d45ac658b80ef1ee43 /res | |
| parent | ec09287bd140f2ec076b62f99f2e5b6ddf464215 (diff) | |
| download | android_packages_apps_Gallery2-7a41c376e299d9944a956004c5176b31a5ef0a4e.tar.gz android_packages_apps_Gallery2-7a41c376e299d9944a956004c5176b31a5ef0a4e.tar.bz2 android_packages_apps_Gallery2-7a41c376e299d9944a956004c5176b31a5ef0a4e.zip | |
Galley2-FR: Create new copy of AOSP files to enhance the functionality.
New files created from Opensource files &
taken from LA.BR.1.2.5 tip
with commit id: 7574509c9d3b73e77917333661e0a2fbab777129
from res/layout/filtershow_editor_panel.xml to res/layout/filtershow_actionbar_effects.xml
with commit id: c12b8b10bc4c033ba6855a400f14c3aae52ec143
from src/com/android/gallery3d/app/AlbumPage.java to src/com/android/gallery3d/app/TimeLinePage.java
with commit id: ed2687a7d84b0d5ab9bf6eb1b20be2ec745444c6
from src/com/android/gallery3d/app/AlbumDataLoader.java to src/com/android/gallery3d/app/TimeLineDataLoader.java
with commit id: be49d8c1ec074ef27c5c49f1dd7b51e236f96bdb
from src/com/android/gallery3d/data/LocalImage.java to src/com/android/gallery3d/data/TimeLineTitleMediaItem.java
with commit id: ed2687a7d84b0d5ab9bf6eb1b20be2ec745444c6
from src/com/android/gallery3d/ui/AlbumLabelMaker.java to src/com/android/gallery3d/ui/TimeLineTitleMaker.java
with commit id: c12b8b10bc4c033ba6855a400f14c3aae52ec143
from src/com/android/gallery3d/ui/AlbumSlidingWindow.java to src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
with commit id: cf002f22904821fb603e6bb625c50159ddc5d8bb
from src/com/android/gallery3d/ui/AlbumSlotRenderer.java to src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
with commit id: ed2687a7d84b0d5ab9bf6eb1b20be2ec745444c6
from src/com/android/gallery3d/ui/SlotView.java to src/com/android/gallery3d/ui/TimeLineSlotView.java
Change-Id: I37c8b0e92e7a23069186f08ddeef3b766d5c8c05
CRs-Fixed: 926603
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_actionbar_effects.xml | 122 |
1 files changed, 122 insertions, 0 deletions
diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml new file mode 100644 index 000000000..995399618 --- /dev/null +++ b/res/layout/filtershow_actionbar_effects.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="visible" > + + <View + android:background="@color/toolbar_separation_line" + android:layout_height="1dip" + android:layout_width="match_parent"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/controlArea" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true" + android:visibility="visible"> + + <SeekBar + android:id="@+id/primarySeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + style="@style/FilterShowSlider"/> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="48dip" + android:background="@color/background_main_toolbar" + android:orientation="horizontal" + android:baselineAligned="false" + android:visibility="visible"> + + <ImageButton + android:id="@+id/cancelFilter" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="left|center_vertical" + android:background="@android:color/transparent" + android:layout_weight=".1" + android:gravity="center" + android:src="@drawable/ic_menu_cancel_holo_light" + android:textSize="18dip"/> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_bar"/> + + <LinearLayout + android:id="@+id/panelAccessoryViewList" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="horizontal" + android:visibility="visible"> + + <com.android.gallery3d.filtershow.editors.SwapButton + android:id="@+id/applyEffect" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center" + android:background="@android:color/transparent" + android:text="@string/apply_effect" + android:textSize="18dip" + android:drawableEnd="@drawable/filtershow_menu_marker_rtl" + android:textAllCaps="true" + /> + + </LinearLayout> + + <ImageView + android:layout_width="2dp" + android:layout_height="fill_parent" + android:src="@drawable/filtershow_vertical_bar"/> + + <ImageButton + android:id="@+id/applyFilter" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="right|center_vertical" + android:layout_weight=".1" + android:background="@android:color/transparent" + android:gravity="center" + android:src="@drawable/ic_menu_done_holo_light" + android:textSize="18dip"/> + </LinearLayout> + + <FrameLayout android:id="@+id/state_panel_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="visible" /> + + </LinearLayout> + +</LinearLayout> |
