</intent-filter>
</activity>
- <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name"
- android:configChanges="keyboardHidden|orientation|screenSize">
+ <activity android:name="com.android.photos.GalleryActivity"
+ android:label="@string/app_name"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:theme="@style/Theme.Photos.Gallery"
+ android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <!-- we add this activity-alias for shortcut backward compatibility -->
- <!-- Note: The alias must put after the target activity -->
- <activity-alias android:name="com.cooliris.media.Gallery"
- android:targetActivity="com.android.gallery3d.app.Gallery"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="@string/app_name">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity-alias>
-
<!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
media from attached MTP devices, like cameras and camera phones -->
<activity android:launchMode="singleInstance"
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp" >
+
+ <ListView
+ android:id="@id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:drawSelectorOnTop="true" />
+
+ <TextView
+ android:id="@id/android:empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/empty_album" />
+
+</FrameLayout>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:id="@+id/menu_camera"
+ android:icon="@android:drawable/ic_menu_camera"
+ android:showAsAction="ifRoom"
+ android:title="@string/menu_camera"/>
+ <item
+ android:id="@+id/menu_search"
+ android:icon="@android:drawable/ic_menu_search"
+ android:showAsAction="ifRoom"
+ android:title="@string/menu_search"/>
+ <item
+ android:id="@+id/menu_settings"
+ android:icon="@android:drawable/ic_menu_preferences"
+ android:showAsAction="never"
+ android:title="@string/settings"/>
+ <item
+ android:id="@+id/menu_help"
+ android:icon="@android:drawable/ic_menu_help"
+ android:showAsAction="never"
+ android:title="@string/help"/>
+</menu>
\ No newline at end of file
<string name="wbalance" msgid="6346581563387083613">"Outokleur"</string>
<string name="hue" msgid="6231252147971086030">"Kleur"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Skaduwees"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurwes"</string>
<string name="vignette" msgid="934721068851885390">"Vinjet"</string>
<string name="redeye" msgid="4508883127049472069">"Rooi oog"</string>
<string name="wbalance" msgid="6346581563387083613">"ራስ-ቀለም መሙላት"</string>
<string name="hue" msgid="6231252147971086030">"የቀለም ድባብ"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"ጥላዎች"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"ጥምዞች"</string>
<string name="vignette" msgid="934721068851885390">"ቪኜት"</string>
<string name="redeye" msgid="4508883127049472069">"ቀይ አይን"</string>
<string name="wbalance" msgid="6346581563387083613">"لون تلقائي"</string>
<string name="hue" msgid="6231252147971086030">"تدرج اللون"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"ظلال"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"المنحنيات"</string>
<string name="vignette" msgid="934721068851885390">"نقوش صورة نصفية"</string>
<string name="redeye" msgid="4508883127049472069">"العين الحمراء"</string>
<string name="wbalance" msgid="6346581563387083613">"Aўтаколер"</string>
<string name="hue" msgid="6231252147971086030">"Тон"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Цені"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Пэндзаль"</string>
<string name="vignette" msgid="934721068851885390">"Віньетка"</string>
<string name="redeye" msgid="4508883127049472069">"Чырвонае вока"</string>
<string name="wbalance" msgid="6346581563387083613">"Авт. цвят"</string>
<string name="hue" msgid="6231252147971086030">"Нюанс"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Засенчване"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Извивки"</string>
<string name="vignette" msgid="934721068851885390">"Винетиране"</string>
<string name="redeye" msgid="4508883127049472069">"Червени очи"</string>
<string name="wbalance" msgid="6346581563387083613">"Autocolor"</string>
<string name="hue" msgid="6231252147971086030">"To de color"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Ombres"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Corbes"</string>
<string name="vignette" msgid="934721068851885390">"Vinyeta"</string>
<string name="redeye" msgid="4508883127049472069">"Ulls vermells"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. barva"</string>
<string name="hue" msgid="6231252147971086030">"Odstín"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Stíny"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Křivky"</string>
<string name="vignette" msgid="934721068851885390">"Viněta"</string>
<string name="redeye" msgid="4508883127049472069">"Červené oči"</string>
<string name="wbalance" msgid="6346581563387083613">"Automatisk farve"</string>
<string name="hue" msgid="6231252147971086030">"Nuance"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Skygger"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurver"</string>
<string name="vignette" msgid="934721068851885390">"Vignet"</string>
<string name="redeye" msgid="4508883127049472069">"Røde øjne"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. Farbe"</string>
<string name="hue" msgid="6231252147971086030">"Farbton"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Schatten"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurven"</string>
<string name="vignette" msgid="934721068851885390">"Vignettierung"</string>
<string name="redeye" msgid="4508883127049472069">"Rote Augen"</string>
<string name="wbalance" msgid="6346581563387083613">"Αυτόματο χρώμα"</string>
<string name="hue" msgid="6231252147971086030">"Απόχρωση"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Σκιές"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Καμπύλες"</string>
<string name="vignette" msgid="934721068851885390">"Βινιετάρισμα"</string>
<string name="redeye" msgid="4508883127049472069">"Κόκκινα μάτια"</string>
<string name="wbalance" msgid="6346581563387083613">"Autocolour"</string>
<string name="hue" msgid="6231252147971086030">"Hue"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Shadows"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curves"</string>
<string name="vignette" msgid="934721068851885390">"Vignette"</string>
<string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
<string name="wbalance" msgid="6346581563387083613">"Color autom."</string>
<string name="hue" msgid="6231252147971086030">"Tono"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
<string name="vignette" msgid="934721068851885390">"Viñeta"</string>
<string name="redeye" msgid="4508883127049472069">"Ojos rojos"</string>
<string name="wbalance" msgid="6346581563387083613">"Color automático"</string>
<string name="hue" msgid="6231252147971086030">"Tonalidad"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curvar"</string>
<string name="vignette" msgid="934721068851885390">"Viñeta"</string>
<string name="redeye" msgid="4508883127049472069">"Ojos rojos"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. värvid"</string>
<string name="hue" msgid="6231252147971086030">"Värvitoon"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Varjud"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kõverad"</string>
<string name="vignette" msgid="934721068851885390">"Vinjett"</string>
<string name="redeye" msgid="4508883127049472069">"Punasilmsus"</string>
<string name="wbalance" msgid="6346581563387083613">"رنگ خودکار"</string>
<string name="hue" msgid="6231252147971086030">"رنگمایه"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"سایهها"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"نمودارها"</string>
<string name="vignette" msgid="934721068851885390">"محو لبهها"</string>
<string name="redeye" msgid="4508883127049472069">"قرمزی چشم"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. värit"</string>
<string name="hue" msgid="6231252147971086030">"Sävy"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Tummat alueet"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Valotuskäyrät"</string>
<string name="vignette" msgid="934721068851885390">"Vinjetti"</string>
<string name="redeye" msgid="4508883127049472069">"Punasilmäisyys"</string>
<string name="wbalance" msgid="6346581563387083613">"Coloration auto"</string>
<string name="hue" msgid="6231252147971086030">"Teinte"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Ombres"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Courbes"</string>
<string name="vignette" msgid="934721068851885390">"Vignetage"</string>
<string name="redeye" msgid="4508883127049472069">"Yeux rouges"</string>
<string name="wbalance" msgid="6346581563387083613">"ऑटोकलर"</string>
<string name="hue" msgid="6231252147971086030">"ह्यू"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"छाया"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"वक्र"</string>
<string name="vignette" msgid="934721068851885390">"विनेट"</string>
<string name="redeye" msgid="4508883127049472069">"रेड आई"</string>
<string name="wbalance" msgid="6346581563387083613">"Automatska boja"</string>
<string name="hue" msgid="6231252147971086030">"Nijansa"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sjenke"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
<string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
<string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
<string name="wbalance" msgid="6346581563387083613">"Automat. szín"</string>
<string name="hue" msgid="6231252147971086030">"Színárnyalat"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Árnyékok"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Görbék"</string>
<string name="vignette" msgid="934721068851885390">"Vignetta"</string>
<string name="redeye" msgid="4508883127049472069">"Vörösszem"</string>
<string name="wbalance" msgid="6346581563387083613">"Warna Otomatis"</string>
<string name="hue" msgid="6231252147971086030">"Rona"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Bayangan"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurva"</string>
<string name="vignette" msgid="934721068851885390">"Vinyet"</string>
<string name="redeye" msgid="4508883127049472069">"Mata Merah"</string>
<string name="wbalance" msgid="6346581563387083613">"Colore autom."</string>
<string name="hue" msgid="6231252147971086030">"Tonalità"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Ombre"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curve"</string>
<string name="vignette" msgid="934721068851885390">"Vignetta"</string>
<string name="redeye" msgid="4508883127049472069">"Occhi rossi"</string>
<string name="wbalance" msgid="6346581563387083613">"צבע אוטומטי"</string>
<string name="hue" msgid="6231252147971086030">"גוון"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"צלליות"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"קימורים"</string>
<string name="vignette" msgid="934721068851885390">"עמעום קצוות"</string>
<string name="redeye" msgid="4508883127049472069">"עיניים אדומות"</string>
<string name="wbalance" msgid="6346581563387083613">"自動色補正"</string>
<string name="hue" msgid="6231252147971086030">"色彩"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"影"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"カーブ"</string>
<string name="vignette" msgid="934721068851885390">"周辺減光"</string>
<string name="redeye" msgid="4508883127049472069">"赤目処理"</string>
<string name="wbalance" msgid="6346581563387083613">"자동 색상"</string>
<string name="hue" msgid="6231252147971086030">"색조"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"그림자"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"곡선"</string>
<string name="vignette" msgid="934721068851885390">"비네트"</string>
<string name="redeye" msgid="4508883127049472069">"적목현상 없애기"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. spalva"</string>
<string name="hue" msgid="6231252147971086030">"Atspalvis"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Šešėliai"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kreivės"</string>
<string name="vignette" msgid="934721068851885390">"Vinjetė"</string>
<string name="redeye" msgid="4508883127049472069">"Raudonos akys"</string>
<string name="wbalance" msgid="6346581563387083613">"Aut. krāsu pal."</string>
<string name="hue" msgid="6231252147971086030">"Nokrāsa"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Ēnas"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Līknes"</string>
<string name="vignette" msgid="934721068851885390">"Vinjete"</string>
<string name="redeye" msgid="4508883127049472069">"Sarkano acu ef."</string>
<string name="wbalance" msgid="6346581563387083613">"Autowarna"</string>
<string name="hue" msgid="6231252147971086030">"Rona"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Bayang-bayang"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Lengkung"</string>
<string name="vignette" msgid="934721068851885390">"Vignet"</string>
<string name="redeye" msgid="4508883127049472069">"Mata Merah"</string>
<string name="wbalance" msgid="6346581563387083613">"Autofarger"</string>
<string name="hue" msgid="6231252147971086030">"Nyanse"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Skygger"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurver"</string>
<string name="vignette" msgid="934721068851885390">"Vignettering"</string>
<string name="redeye" msgid="4508883127049472069">"Røde øyne"</string>
<string name="wbalance" msgid="6346581563387083613">"Auto-kleur"</string>
<string name="hue" msgid="6231252147971086030">"Kleurschakering"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Schaduw"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curven"</string>
<string name="vignette" msgid="934721068851885390">"Vervloeien"</string>
<string name="redeye" msgid="4508883127049472069">"Rode ogen"</string>
<string name="wbalance" msgid="6346581563387083613">"Autokolor"</string>
<string name="hue" msgid="6231252147971086030">"Odcień"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Cienie"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Krzywe"</string>
<string name="vignette" msgid="934721068851885390">"Winietowanie"</string>
<string name="redeye" msgid="4508883127049472069">"Czerwone oczy"</string>
<string name="wbalance" msgid="6346581563387083613">"Cor automática"</string>
<string name="hue" msgid="6231252147971086030">"Tonalidade"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
<string name="vignette" msgid="934721068851885390">"Vinheta"</string>
<string name="redeye" msgid="4508883127049472069">"Olhos Vermelhos"</string>
<string name="wbalance" msgid="6346581563387083613">"Cor automática"</string>
<string name="hue" msgid="6231252147971086030">"Matiz"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sombras"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curvas"</string>
<string name="vignette" msgid="934721068851885390">"Vinheta"</string>
<string name="redeye" msgid="4508883127049472069">"Olhos vermelhos"</string>
<string name="wbalance" msgid="6346581563387083613">"Culoare auto."</string>
<string name="hue" msgid="6231252147971086030">"Tonalitate"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Umbre"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Curbe"</string>
<string name="vignette" msgid="934721068851885390">"Vignetare"</string>
<string name="redeye" msgid="4508883127049472069">"Ochi roşii"</string>
<string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
<string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
<string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
- <string name="aspectNone_effect" msgid="6263330561046574134">"Ð\9eÑ\80игинал"</string>
+ <string name="aspectNone_effect" msgid="6263330561046574134">"Ð\92Ñ\80Ñ\83Ñ\87нÑ\83Ñ\8e"</string>
<!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
<skip />
<string name="Fixed" msgid="8017376448916924565">"Постоянное"</string>
<string name="wbalance" msgid="6346581563387083613">"Авторежим"</string>
<string name="hue" msgid="6231252147971086030">"Оттенок"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Тени"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Кривые"</string>
<string name="vignette" msgid="934721068851885390">"Виньет-ние"</string>
<string name="redeye" msgid="4508883127049472069">"Красные глаза"</string>
<string name="wbalance" msgid="6346581563387083613">"Autom. farba"</string>
<string name="hue" msgid="6231252147971086030">"Odtieň"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Tiene"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Krivky"</string>
<string name="vignette" msgid="934721068851885390">"Vineta"</string>
<string name="redeye" msgid="4508883127049472069">"Červené oči"</string>
<string name="wbalance" msgid="6346581563387083613">"Samodej. barva"</string>
<string name="hue" msgid="6231252147971086030">"Odtenek"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Sence"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
<string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
<string name="redeye" msgid="4508883127049472069">"Rdeče oči"</string>
<string name="wbalance" msgid="6346581563387083613">"Аутоматска боја"</string>
<string name="hue" msgid="6231252147971086030">"Нијанса"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Сенке"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Криве"</string>
<string name="vignette" msgid="934721068851885390">"Вињета"</string>
<string name="redeye" msgid="4508883127049472069">"Црвене очи"</string>
<string name="wbalance" msgid="6346581563387083613">"Autofärg"</string>
<string name="hue" msgid="6231252147971086030">"Nyans"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Skuggor"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Kurvor"</string>
<string name="vignette" msgid="934721068851885390">"Vignette"</string>
<string name="redeye" msgid="4508883127049472069">"Röda ögon"</string>
<string name="wbalance" msgid="6346581563387083613">"Rangi otomatiki"</string>
<string name="hue" msgid="6231252147971086030">"Rangi"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Vivuli"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Pindo"</string>
<string name="vignette" msgid="934721068851885390">"Vignete"</string>
<string name="redeye" msgid="4508883127049472069">"Jicho Jekundu"</string>
<string name="wbalance" msgid="6346581563387083613">"ให้สีอัตโนมัติ"</string>
<string name="hue" msgid="6231252147971086030">"สี"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"เงา"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"เส้นโค้ง"</string>
<string name="vignette" msgid="934721068851885390">"วิกเน็ตต์"</string>
<string name="redeye" msgid="4508883127049472069">"ตาแดง"</string>
<string name="wbalance" msgid="6346581563387083613">"Autocolor"</string>
<string name="hue" msgid="6231252147971086030">"Hue"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Mga Shadow"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Mga Kurba"</string>
<string name="vignette" msgid="934721068851885390">"Vignette"</string>
<string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
<string name="wbalance" msgid="6346581563387083613">"Otomatik Renk"</string>
<string name="hue" msgid="6231252147971086030">"Hue"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Gölgeler"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Eğriler"</string>
<string name="vignette" msgid="934721068851885390">"Vinyet"</string>
<string name="redeye" msgid="4508883127049472069">"Kırmızı Göz"</string>
<string name="wbalance" msgid="6346581563387083613">"Автоколір"</string>
<string name="hue" msgid="6231252147971086030">"Тон"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Тіні"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Криві"</string>
<string name="vignette" msgid="934721068851885390">"Віньєтка"</string>
<string name="redeye" msgid="4508883127049472069">"Червоні очі"</string>
<style name="ActionBarTwoLineItem">
<item name="android:background">?android:attr/activatedBackgroundIndicator</item>
</style>
+ <style name="Theme.Photos.Gallery" parent="android:Theme.Holo.Light">
+ </style>
</resources>
<string name="wbalance" msgid="6346581563387083613">"Màu tự động"</string>
<string name="hue" msgid="6231252147971086030">"Màu sắc"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Bóng"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Đồ thị màu"</string>
<string name="vignette" msgid="934721068851885390">"Làm mờ nét ảnh"</string>
<string name="redeye" msgid="4508883127049472069">"Mắt đỏ"</string>
<string name="wbalance" msgid="6346581563387083613">"自动调整色彩"</string>
<string name="hue" msgid="6231252147971086030">"色调"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"阴影"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"曲线"</string>
<string name="vignette" msgid="934721068851885390">"晕影"</string>
<string name="redeye" msgid="4508883127049472069">"红眼"</string>
<string name="wbalance" msgid="6346581563387083613">"自動色彩校正"</string>
<string name="hue" msgid="6231252147971086030">"色調"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"陰影"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"曲線"</string>
<string name="vignette" msgid="934721068851885390">"暈影"</string>
<string name="redeye" msgid="4508883127049472069">"紅眼"</string>
<string name="wbalance" msgid="6346581563387083613">"I-Autocolor"</string>
<string name="hue" msgid="6231252147971086030">"I-Hue"</string>
<string name="shadow_recovery" msgid="3928572915300287152">"Izithunzi"</string>
+ <!-- no translation found for highlight_recovery (8262208470735204243) -->
+ <skip />
<string name="curvesRGB" msgid="915010781090477550">"Ukugobeka"</string>
<string name="vignette" msgid="934721068851885390">"I-Vignette"</string>
<string name="redeye" msgid="4508883127049472069">"Iso elibomvu"</string>
<string name="cannot_load_image">Cannot load the image!</string>
<!-- String displayed when showing the original image [CHAR LIMIT=NONE] -->
<string name="original_picture_text">@string/original</string>
+ <!-- String displayed when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+ <string name="setting_wallpaper">Setting wallpaper</string>
<!-- generic strings -->
<!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
<string name="remember_location_yes">Yes</string>
+ <!-- Menu item to launch the camera app [CHAR LIMIT=25] -->
+ <string name="menu_camera">Camera</string>
+ <!-- Menu item to search for photos [CHAR LIMIT=25] -->
+ <string name="menu_search">Search</string>
+ <!-- Title for the all photos tab [CHAR LIMIT=25] -->
+ <string name="tab_photos">Photos</string>
+ <!-- Title for the albums tab [CHAR LIMIT=25] -->
+ <string name="tab_albums">Albums</string>
</resources>
--- /dev/null
+/*
+ * 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.
+ */
+
+package android.util;
+
+/**
+ * Helper class for crating pools of objects. An example use looks like this:
+ * <pre>
+ * public class MyPooledClass {
+ *
+ * private static final SynchronizedPool<MyPooledClass> sPool =
+ * new SynchronizedPool<MyPooledClass>(10);
+ *
+ * public static MyPooledClass obtain() {
+ * MyPooledClass instance = sPool.acquire();
+ * return (instance != null) ? instance : new MyPooledClass();
+ * }
+ *
+ * public void recycle() {
+ * // Clear state if needed.
+ * sPool.release(this);
+ * }
+ *
+ * . . .
+ * }
+ * </pre>
+ *
+ * @hide
+ */
+public final class Pools {
+
+ /**
+ * Interface for managing a pool of objects.
+ *
+ * @param <T> The pooled type.
+ */
+ public static interface Pool<T> {
+
+ /**
+ * @return An instance from the pool if such, null otherwise.
+ */
+ public T acquire();
+
+ /**
+ * Release an instance to the pool.
+ *
+ * @param instance The instance to release.
+ * @return Whether the instance was put in the pool.
+ *
+ * @throws IllegalStateException If the instance is already in the pool.
+ */
+ public boolean release(T instance);
+ }
+
+ private Pools() {
+ /* do nothing - hiding constructor */
+ }
+
+ /**
+ * Simple (non-synchronized) pool of objects.
+ *
+ * @param <T> The pooled type.
+ */
+ public static class SimplePool<T> implements Pool<T> {
+ private final Object[] mPool;
+
+ private int mPoolSize;
+
+ /**
+ * Creates a new instance.
+ *
+ * @param maxPoolSize The max pool size.
+ *
+ * @throws IllegalArgumentException If the max pool size is less than zero.
+ */
+ public SimplePool(int maxPoolSize) {
+ if (maxPoolSize <= 0) {
+ throw new IllegalArgumentException("The max pool size must be > 0");
+ }
+ mPool = new Object[maxPoolSize];
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public T acquire() {
+ if (mPoolSize > 0) {
+ final int lastPooledIndex = mPoolSize - 1;
+ T instance = (T) mPool[lastPooledIndex];
+ mPool[lastPooledIndex] = null;
+ mPoolSize--;
+ return instance;
+ }
+ return null;
+ }
+
+ @Override
+ public boolean release(T instance) {
+ if (isInPool(instance)) {
+ throw new IllegalStateException("Already in the pool!");
+ }
+ if (mPoolSize < mPool.length) {
+ mPool[mPoolSize] = instance;
+ mPoolSize++;
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isInPool(T instance) {
+ for (int i = 0; i < mPoolSize; i++) {
+ if (mPool[i] == instance) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ /**
+ * Synchronized) pool of objects.
+ *
+ * @param <T> The pooled type.
+ */
+ public static class SynchronizedPool<T> extends SimplePool<T> {
+ private final Object mLock = new Object();
+
+ /**
+ * Creates a new instance.
+ *
+ * @param maxPoolSize The max pool size.
+ *
+ * @throws IllegalArgumentException If the max pool size is less than zero.
+ */
+ public SynchronizedPool(int maxPoolSize) {
+ super(maxPoolSize);
+ }
+
+ @Override
+ public T acquire() {
+ synchronized (mLock) {
+ return super.acquire();
+ }
+ }
+
+ @Override
+ public boolean release(T element) {
+ synchronized (mLock) {
+ return super.release(element);
+ }
+ }
+ }
+}
\ No newline at end of file
mCountDownView.cancelCountDown();
// Close the camera now because other activities may need to use it.
closeCamera();
- if (mSurfaceTexture != null) {
- ((CameraScreenNail) mActivity.mCameraScreenNail).releaseSurfaceTexture();
- mSurfaceTexture = null;
- }
+ // Release surface texture.
+ ((CameraScreenNail) mActivity.mCameraScreenNail).releaseSurfaceTexture();
+ mSurfaceTexture = null;
resetScreenOn();
// Clear UI.
import com.android.gallery3d.R;
import com.android.gallery3d.common.ApiHelper;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.DataManager;
import com.android.gallery3d.data.MediaItem;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.ui.GLRoot;
import com.android.gallery3d.ui.GLRootView;
import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper;
} finally {
mGLRootView.unlockRenderThread();
}
- clearBitmapPool(MediaItem.getMicroThumbPool());
- clearBitmapPool(MediaItem.getThumbPool());
-
+ GalleryBitmapPool.getInstance().clear();
MediaItem.getBytesBufferPool().clear();
}
- private static void clearBitmapPool(BitmapPool pool) {
- if (pool != null) pool.clear();
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
import com.android.gallery3d.common.BitmapUtils;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.ContentListener;
import com.android.gallery3d.data.LocalMediaItem;
import com.android.gallery3d.data.MediaItem;
}
@Override
- public Bitmap getTile(int level, int x, int y, int tileSize, BitmapPool pool) {
- return mTileProvider.getTile(level, x, y, tileSize, pool);
+ public Bitmap getTile(int level, int x, int y, int tileSize) {
+ return mTileProvider.getTile(level, x, y, tileSize);
}
@Override
+++ /dev/null
-/*
- * Copyright (C) 2011 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.
- */
-
-package com.android.gallery3d.data;
-
-import android.graphics.Bitmap;
-
-import com.android.gallery3d.common.Utils;
-
-import java.util.ArrayList;
-
-public class BitmapPool {
- @SuppressWarnings("unused")
- private static final String TAG = "BitmapPool";
-
- private final ArrayList<Bitmap> mPool;
- private final int mPoolLimit;
-
- // mOneSize is true if the pool can only cache Bitmap with one size.
- private final boolean mOneSize;
- private final int mWidth, mHeight; // only used if mOneSize is true
-
- // Construct a BitmapPool which caches bitmap with the specified size.
- public BitmapPool(int width, int height, int poolLimit) {
- mWidth = width;
- mHeight = height;
- mPoolLimit = poolLimit;
- mPool = new ArrayList<Bitmap>(poolLimit);
- mOneSize = true;
- }
-
- // Construct a BitmapPool which caches bitmap with any size;
- public BitmapPool(int poolLimit) {
- mWidth = -1;
- mHeight = -1;
- mPoolLimit = poolLimit;
- mPool = new ArrayList<Bitmap>(poolLimit);
- mOneSize = false;
- }
-
- // Get a Bitmap from the pool.
- public synchronized Bitmap getBitmap() {
- Utils.assertTrue(mOneSize);
- int size = mPool.size();
- return size > 0 ? mPool.remove(size - 1) : null;
- }
-
- // Get a Bitmap from the pool with the specified size.
- public synchronized Bitmap getBitmap(int width, int height) {
- Utils.assertTrue(!mOneSize);
- for (int i = mPool.size() - 1; i >= 0; i--) {
- Bitmap b = mPool.get(i);
- if (b.getWidth() == width && b.getHeight() == height) {
- return mPool.remove(i);
- }
- }
- return null;
- }
-
- // Put a Bitmap into the pool, if the Bitmap has a proper size. Otherwise
- // the Bitmap will be recycled. If the pool is full, an old Bitmap will be
- // recycled.
- public void recycle(Bitmap bitmap) {
- if (bitmap == null) return;
- if (mOneSize && ((bitmap.getWidth() != mWidth) ||
- (bitmap.getHeight() != mHeight))) {
- bitmap.recycle();
- return;
- }
- synchronized (this) {
- if (mPool.size() >= mPoolLimit) mPool.remove(0);
- mPool.add(bitmap);
- }
- }
-
- public synchronized void clear() {
- mPool.clear();
- }
-
- public boolean isOneSize() {
- return mOneSize;
- }
-}
package com.android.gallery3d.data;
+import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import com.android.gallery3d.app.GalleryApp;
import com.android.gallery3d.app.StitchingChangeListener;
-import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.Utils;
import com.android.gallery3d.data.MediaObject.PanoramaSupportCallback;
import com.android.gallery3d.data.MediaSet.ItemConsumer;
// to prevent concurrency issue.
public static final Object LOCK = new Object();
+ public static DataManager from(Context context) {
+ GalleryApp app = (GalleryApp) context.getApplicationContext();
+ return app.getDataManager();
+ }
+
private static final String TAG = "DataManager";
// This is the path for the media set seen by the user at top level.
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.BitmapUtils;
import com.android.gallery3d.common.Utils;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.ui.Log;
import com.android.gallery3d.util.ThreadPool.CancelListener;
import com.android.gallery3d.util.ThreadPool.JobContext;
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public static Bitmap decode(JobContext jc, byte[] data, int offset,
- int length, BitmapFactory.Options options, BitmapPool pool) {
- if (pool == null) {
- return decode(jc, data, offset, length, options);
- }
-
+ public static Bitmap decodeUsingPool(JobContext jc, byte[] data, int offset,
+ int length, BitmapFactory.Options options) {
if (options == null) options = new BitmapFactory.Options();
if (options.inSampleSize < 1) options.inSampleSize = 1;
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
options.inBitmap = (options.inSampleSize == 1)
- ? findCachedBitmap(pool, jc, data, offset, length, options) : null;
+ ? findCachedBitmap(jc, data, offset, length, options) : null;
try {
Bitmap bitmap = decode(jc, data, offset, length, options);
if (options.inBitmap != null && options.inBitmap != bitmap) {
- pool.recycle(options.inBitmap);
+ GalleryBitmapPool.getInstance().put(options.inBitmap);
options.inBitmap = null;
}
return bitmap;
if (options.inBitmap == null) throw e;
Log.w(TAG, "decode fail with a given bitmap, try decode to a new bitmap");
- pool.recycle(options.inBitmap);
+ GalleryBitmapPool.getInstance().put(options.inBitmap);
options.inBitmap = null;
return decode(jc, data, offset, length, options);
}
// This is the same as the method above except the source data comes
// from a file descriptor instead of a byte array.
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
- public static Bitmap decode(JobContext jc,
- FileDescriptor fileDescriptor, Options options, BitmapPool pool) {
- if (pool == null) {
- return decode(jc, fileDescriptor, options);
- }
-
+ public static Bitmap decodeUsingPool(JobContext jc,
+ FileDescriptor fileDescriptor, Options options) {
if (options == null) options = new BitmapFactory.Options();
if (options.inSampleSize < 1) options.inSampleSize = 1;
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
options.inBitmap = (options.inSampleSize == 1)
- ? findCachedBitmap(pool, jc, fileDescriptor, options) : null;
+ ? findCachedBitmap(jc, fileDescriptor, options) : null;
try {
Bitmap bitmap = DecodeUtils.decode(jc, fileDescriptor, options);
if (options.inBitmap != null && options.inBitmap != bitmap) {
- pool.recycle(options.inBitmap);
+ GalleryBitmapPool.getInstance().put(options.inBitmap);
options.inBitmap = null;
}
return bitmap;
if (options.inBitmap == null) throw e;
Log.w(TAG, "decode fail with a given bitmap, try decode to a new bitmap");
- pool.recycle(options.inBitmap);
+ GalleryBitmapPool.getInstance().put(options.inBitmap);
options.inBitmap = null;
return decode(jc, fileDescriptor, options);
}
}
- private static Bitmap findCachedBitmap(BitmapPool pool, JobContext jc,
- byte[] data, int offset, int length, Options options) {
- if (pool.isOneSize()) return pool.getBitmap();
+ private static Bitmap findCachedBitmap(JobContext jc, byte[] data,
+ int offset, int length, Options options) {
decodeBounds(jc, data, offset, length, options);
- return pool.getBitmap(options.outWidth, options.outHeight);
+ return GalleryBitmapPool.getInstance().get(options.outWidth, options.outHeight);
}
- private static Bitmap findCachedBitmap(BitmapPool pool, JobContext jc,
- FileDescriptor fileDescriptor, Options options) {
- if (pool.isOneSize()) return pool.getBitmap();
+ private static Bitmap findCachedBitmap(JobContext jc, FileDescriptor fileDescriptor,
+ Options options) {
decodeBounds(jc, fileDescriptor, options);
- return pool.getBitmap(options.outWidth, options.outHeight);
+ return GalleryBitmapPool.getInstance().get(options.outWidth, options.outHeight);
}
}
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
Bitmap bitmap;
if (mType == MediaItem.TYPE_MICROTHUMBNAIL) {
- bitmap = DecodeUtils.decode(jc,
- buffer.data, buffer.offset, buffer.length, options,
- MediaItem.getMicroThumbPool());
+ bitmap = DecodeUtils.decodeUsingPool(jc,
+ buffer.data, buffer.offset, buffer.length, options);
} else {
- bitmap = DecodeUtils.decode(jc,
- buffer.data, buffer.offset, buffer.length, options,
- MediaItem.getThumbPool());
+ bitmap = DecodeUtils.decodeUsingPool(jc,
+ buffer.data, buffer.offset, buffer.length, options);
}
if (bitmap == null && !jc.isCancelled()) {
Log.w(TAG, "decode cached failed " + debugTag());
private static final int BYTESBUFFER_SIZE = 200 * 1024;
private static int sMicrothumbnailTargetSize = 200;
- private static BitmapPool sMicroThumbPool;
private static final BytesBufferPool sMicroThumbBufferPool =
new BytesBufferPool(BYTESBUFFE_POOL_SIZE, BYTESBUFFER_SIZE);
private static int sThumbnailTargetSize = 640;
- private static final BitmapPool sThumbPool =
- ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY
- ? new BitmapPool(4)
- : null;
// TODO: fix default value for latlng and change this.
public static final double INVALID_LATLNG = 0f;
}
}
- public static BitmapPool getMicroThumbPool() {
- if (ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY && sMicroThumbPool == null) {
- initializeMicroThumbPool();
- }
- return sMicroThumbPool;
- }
-
- public static BitmapPool getThumbPool() {
- return sThumbPool;
- }
-
public static BytesBufferPool getBytesBufferPool() {
return sMicroThumbBufferPool;
}
- private static void initializeMicroThumbPool() {
- sMicroThumbPool =
- ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY
- ? new BitmapPool(sMicrothumbnailTargetSize, sMicrothumbnailTargetSize, 16)
- : null;
- }
-
public static void setThumbnailSizes(int size, int microSize) {
sThumbnailTargetSize = size;
if (sMicrothumbnailTargetSize != microSize) {
sMicrothumbnailTargetSize = microSize;
- initializeMicroThumbPool();
}
}
}
import com.android.gallery3d.filtershow.imageshow.MasterImage;
import com.android.gallery3d.filtershow.presets.ImagePreset;
import com.android.gallery3d.filtershow.provider.SharedImageProvider;
+import com.android.gallery3d.filtershow.tools.BitmapTask;
import com.android.gallery3d.filtershow.tools.SaveCopyTask;
import com.android.gallery3d.filtershow.ui.FilterIconButton;
import com.android.gallery3d.filtershow.ui.FramedTextButton;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ ImageFilter.setActivityForMemoryToasts(this);
setResources();
Resources res = getResources();
if (mLoadBitmapTask != null) {
mLoadBitmapTask.cancel(false);
}
+ MasterImage.reset();
+ FilteringPipeline.reset();
+ ImageFilter.resetStatics();
super.onDestroy();
}
mCropExtras.getOutputFormat(), this);
}
if (mSaveAsWallpaper) {
- try {
- WallpaperManager.getInstance(this).setBitmap(filtered);
- } catch (IOException e) {
- Log.w(LOGTAG, "fail to set wall paper", e);
- }
+ setWallpaperInBackground(filtered);
}
if (mReturnAsExtra) {
if (filtered != null) {
}
}
+ void setWallpaperInBackground(final Bitmap bmap) {
+ Toast.makeText(this, R.string.setting_wallpaper, Toast.LENGTH_LONG).show();
+ BitmapTask.Callbacks<FilterShowActivity> cb = new BitmapTask.Callbacks<FilterShowActivity>() {
+ @Override
+ public void onComplete(Bitmap result) {}
+
+ @Override
+ public void onCancel() {}
+
+ @Override
+ public Bitmap onExecute(FilterShowActivity param) {
+ try {
+ WallpaperManager.getInstance(param).setBitmap(bmap);
+ } catch (IOException e) {
+ Log.w(LOGTAG, "fail to set wall paper", e);
+ }
+ return null;
+ }
+ };
+ (new BitmapTask<FilterShowActivity>(cb)).execute(this);
+ }
+
public void done() {
if (mOutputted) {
hideSavingProgress();
ImageShow image = null;
mActivity.hideImageViews();
for (View view : mImageViews) {
+ image = (ImageShow) view;
if (view.getId() == id) {
view.setVisibility(View.VISIBLE);
- image = (ImageShow) view;
+ image.select();
} else {
view.setVisibility(View.GONE);
+ image.unselect();
}
}
return image;
}
mUtilityPanel.hideAccessoryViews();
- if (view instanceof FilterIconButton) {
+ if (view instanceof FilterIconButton && view.getId() != R.id.applyEffect) {
mCurrentEditor = null;
FilterIconButton component = (FilterIconButton) view;
FilterRepresentation representation = component.getFilterRepresentation();
if (mCurrentImage instanceof ImageCrop && mUtilityPanel.firstTimeCropDisplayed) {
((ImageCrop) mCurrentImage).clear();
mUtilityPanel.firstTimeCropDisplayed = false;
+ ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect);
}
- ((ImageCrop) mCurrentImage).setFixedAspect(mFixedAspect);
break;
}
case R.id.rotateButton: {
public class FilteringPipeline implements Handler.Callback {
- private final static FilteringPipeline gPipeline = new FilteringPipeline();
+ private static FilteringPipeline sPipeline;
private static final String LOGTAG = "FilteringPipeline";
private ImagePreset mPreviousGeometryPreset = null;
private ImagePreset mPreviousFiltersPreset = null;
private final static int NEW_RENDERING_REQUEST = 1;
private final static int COMPUTE_PRESET = 2;
private final static int COMPUTE_RENDERING_REQUEST = 3;
+ private final static int COMPUTE_PARTIAL_RENDERING_REQUEST = 4;
private Handler mProcessingHandler = null;
private final Handler mUIHandler = new Handler() {
mUIHandler.sendMessage(uimsg);
break;
}
- case COMPUTE_RENDERING_REQUEST: {
+ case COMPUTE_RENDERING_REQUEST:
+ case COMPUTE_PARTIAL_RENDERING_REQUEST: {
+ if (msg.what == COMPUTE_PARTIAL_RENDERING_REQUEST) {
+ if (mProcessingHandler.hasMessages(COMPUTE_PARTIAL_RENDERING_REQUEST)) {
+ return false;
+ }
+ }
RenderingRequest request = (RenderingRequest) msg.obj;
render(request);
Message uimsg = mUIHandler.obtainMessage(NEW_RENDERING_REQUEST);
private static float RESIZE_FACTOR = 0.8f;
private static float MAX_PROCESS_TIME = 100; // in ms
+ private static long HIRES_DELAY = 100; // in ms
private float mResizeFactor = 1.0f;
private long mResizeTime = 0;
}
public static FilteringPipeline getPipeline() {
- return gPipeline;
+ if (sPipeline == null) {
+ sPipeline = new FilteringPipeline();
+ }
+ return sPipeline;
}
public synchronized void setOriginal(Bitmap bitmap) {
if (mOriginalAllocation == null) {
return;
}
- Message msg = mProcessingHandler.obtainMessage(COMPUTE_RENDERING_REQUEST);
+ int type = COMPUTE_RENDERING_REQUEST;
+ if (request.getType() == RenderingRequest.PARTIAL_RENDERING) {
+ type = COMPUTE_PARTIAL_RENDERING_REQUEST;
+ }
+ Message msg = mProcessingHandler.obtainMessage(type);
msg.obj = request;
- mProcessingHandler.sendMessage(msg);
+ if (type == COMPUTE_PARTIAL_RENDERING_REQUEST) {
+ mProcessingHandler.sendMessageDelayed(msg, HIRES_DELAY);
+ } else {
+ mProcessingHandler.sendMessage(msg);
+ }
}
public synchronized void updatePreviewBuffer() {
if (request.getType() == RenderingRequest.GEOMETRY_RENDERING) {
return "GEOMETRY_RENDERING";
}
+ if (request.getType() == RenderingRequest.PARTIAL_RENDERING) {
+ return "PARTIAL_RENDERING";
+ }
return "UNKNOWN TYPE!";
}
private void render(RenderingRequest request) {
- if (request.getBitmap() == null
+ if ((request.getType() != RenderingRequest.PARTIAL_RENDERING
+ && request.getBitmap() == null)
|| request.getImagePreset() == null) {
return;
}
Bitmap bitmap = request.getBitmap();
ImagePreset preset = request.getImagePreset();
setPresetParameters(preset);
+
+ if (request.getType() == RenderingRequest.PARTIAL_RENDERING) {
+ bitmap = MasterImage.getImage().getImageLoader().getScaleOneImageForPreset(null, preset, request.getBounds(), request.getDestination(), false);
+ if (bitmap == null) {
+ return;
+ }
+ bitmap = preset.applyGeometry(bitmap);
+ }
+
if (request.getType() == RenderingRequest.FILTERS_RENDERING) {
FiltersManager.getManager().resetBitmapsRS();
}
- if (request.getType() != RenderingRequest.ICON_RENDERING) {
+ if (request.getType() != RenderingRequest.ICON_RENDERING
+ && request.getType() != RenderingRequest.PARTIAL_RENDERING) {
updateOriginalAllocation(preset);
}
if (DEBUG) {
} else if (request.getType() == RenderingRequest.FILTERS_RENDERING) {
mFiltersOnlyOriginalAllocation.copyTo(bitmap);
}
+
if (request.getType() == RenderingRequest.FULL_RENDERING
|| request.getType() == RenderingRequest.FILTERS_RENDERING
- || request.getType() == RenderingRequest.ICON_RENDERING) {
+ || request.getType() == RenderingRequest.ICON_RENDERING
+ || request.getType() == RenderingRequest.PARTIAL_RENDERING) {
Bitmap bmp = preset.apply(bitmap);
request.setBitmap(bmp);
}
public float getPreviewScaleFactor() {
return mPreviewScaleFactor;
}
+
+ public static void reset() {
+ sPipeline = null;
+ }
}
import java.util.Vector;
import java.util.concurrent.locks.ReentrantLock;
+
+// TODO: this class has waaaay to much bitmap copying. Cleanup.
public class ImageLoader {
private static final String LOGTAG = "ImageLoader";
bitmap.getHeight(), matrix, true);
}
- private Bitmap loadRegionBitmap(Uri uri, Rect bounds) {
+ private Bitmap loadRegionBitmap(Uri uri, BitmapFactory.Options options, Rect bounds) {
InputStream is = null;
try {
is = mContext.getContentResolver().openInputStream(uri);
BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
- return decoder.decodeRegion(bounds, null);
+ return decoder.decodeRegion(bounds, options);
} catch (FileNotFoundException e) {
Log.e(LOGTAG, "FileNotFoundException: " + uri);
} catch (Exception e) {
// FIXME: this currently does the loading + filtering on the UI thread --
// need to move this to a background thread.
public Bitmap getScaleOneImageForPreset(ImageShow caller, ImagePreset imagePreset, Rect bounds,
- boolean force) {
+ Rect destination, boolean force) {
mLoadingLock.lock();
Bitmap bmp = mZoomCache.getImage(imagePreset, bounds);
if (force || bmp == null) {
- bmp = loadRegionBitmap(mUri, bounds);
+ BitmapFactory.Options options = null;
+ if (destination != null) {
+ options = new BitmapFactory.Options();
+ if (bounds.width() > destination.width()) {
+ int sampleSize = 1;
+ int w = bounds.width();
+ while (w > destination.width()) {
+ sampleSize *= 2;
+ w /= sampleSize;
+ }
+ options.inSampleSize = sampleSize;
+ }
+ }
+ bmp = loadRegionBitmap(mUri, options, bounds);
+ if (destination != null) {
+ mLoadingLock.unlock();
+ return bmp;
+ }
if (bmp != null) {
- // TODO: this workaround for RS might not be needed ultimately
- Bitmap bmp2 = bmp.copy(Bitmap.Config.ARGB_8888, true);
float scaleFactor = imagePreset.getScaleFactor();
imagePreset.setScaleFactor(1.0f);
- bmp2 = imagePreset.apply(bmp2);
+ bmp = imagePreset.apply(bmp);
imagePreset.setScaleFactor(scaleFactor);
- mZoomCache.setImage(imagePreset, bounds, bmp2);
+ mZoomCache.setImage(imagePreset, bounds, bmp);
mLoadingLock.unlock();
- return bmp2;
+ return bmp;
}
}
mLoadingLock.unlock();
package com.android.gallery3d.filtershow.cache;
import android.graphics.Bitmap;
+import android.graphics.Rect;
import com.android.gallery3d.app.Log;
import com.android.gallery3d.filtershow.imageshow.MasterImage;
import com.android.gallery3d.filtershow.presets.ImagePreset;
private Bitmap mBitmap = null;
private ImagePreset mImagePreset = null;
private RenderingRequestCaller mCaller = null;
+ private Rect mBounds = null;
+ private Rect mDestination = null;
private int mType = FULL_RENDERING;
- public static int FULL_RENDERING = 0;
- public static int FILTERS_RENDERING = 1;
- public static int GEOMETRY_RENDERING = 2;
- public static int ICON_RENDERING = 3;
+ public static final int FULL_RENDERING = 0;
+ public static final int FILTERS_RENDERING = 1;
+ public static final int GEOMETRY_RENDERING = 2;
+ public static final int ICON_RENDERING = 3;
+ public static final int PARTIAL_RENDERING = 4;
private static final Bitmap.Config mConfig = Bitmap.Config.ARGB_8888;
+ public static void post(Bitmap source, ImagePreset preset, int type, RenderingRequestCaller caller) {
+ RenderingRequest.post(source, preset, type, caller, null, null);
+ }
+
public static void post(Bitmap source, ImagePreset preset, int type,
- RenderingRequestCaller caller) {
- if (source == null || preset == null || caller == null) {
+ RenderingRequestCaller caller, Rect bounds, Rect destination) {
+ if ((type != PARTIAL_RENDERING && source == null) || preset == null || caller == null) {
Log.v(LOGTAG, "something null: source: " + source + " or preset: " + preset + " or caller: " + caller);
return;
}
RenderingRequest request = new RenderingRequest();
Bitmap bitmap = null;
- if (type == FULL_RENDERING || type == GEOMETRY_RENDERING || type == ICON_RENDERING) {
+ if (type == FULL_RENDERING
+ || type == GEOMETRY_RENDERING
+ || type == ICON_RENDERING) {
bitmap = preset.applyGeometry(source);
- } else {
+ } else if (type != PARTIAL_RENDERING) {
bitmap = Bitmap.createBitmap(source.getWidth(), source.getHeight(), mConfig);
}
+
request.setBitmap(bitmap);
ImagePreset passedPreset = new ImagePreset(preset);
passedPreset.setImageLoader(MasterImage.getImage().getImageLoader());
+
+ if (type == PARTIAL_RENDERING) {
+ request.setBounds(bounds);
+ request.setDestination(destination);
+ passedPreset.setPartialRendering(true, bounds);
+ }
+
request.setImagePreset(passedPreset);
request.setType(type);
request.setCaller(caller);
public void setCaller(RenderingRequestCaller caller) {
mCaller = caller;
}
+
+ public Rect getBounds() {
+ return mBounds;
+ }
+
+ public void setBounds(Rect bounds) {
+ mBounds = bounds;
+ }
+
+ public Rect getDestination() {
+ return mDestination;
+ }
+
+ public void setDestination(Rect destination) {
+ mDestination = destination;
+ }
}
setShowEditingControls(false);
setShowParameterValue(false);
setShowUtilityPanel(true);
+ setSupportsPartialRendering(true);
for (int i = 0; i < mSplines.length; i++) {
mSplines[i] = new Spline();
mSplines[i].reset();
mCurrent = null;
}
+ public void clearCurrentSection() {
+ mCurrent = null;
+ }
+
public void clear() {
mCurrent = null;
mDrawing.clear();
setShowEditingControls(false);
setShowParameterValue(false);
setShowUtilityPanel(false);
+ setSupportsPartialRendering(true);
}
public String toString() {
private String mName;
private int mPriority = TYPE_NORMAL;
private Class mFilterClass;
+ private boolean mSupportsPartialRendering = false;
private int mTextId = 0;
private int mEditorId = BasicEditor.ID;
private int mButtonId = 0;
representation.setName(getName());
representation.setPriority(getPriority());
representation.setFilterClass(getFilterClass());
+ representation.setSupportsPartialRendering(supportsPartialRendering());
representation.setTextId(getTextId());
representation.setEditorId(getEditorId());
representation.setButtonId(getButtonId());
if (representation.mFilterClass == representation.mFilterClass
&& representation.mName.equalsIgnoreCase(mName)
&& representation.mPriority == mPriority
+ && representation.mSupportsPartialRendering == mSupportsPartialRendering
&& representation.mTextId == mTextId
&& representation.mEditorId == mEditorId
&& representation.mButtonId == mButtonId
return false;
}
+ public boolean supportsPartialRendering() {
+ return mSupportsPartialRendering;
+ }
+
+ public void setSupportsPartialRendering(boolean value) {
+ mSupportsPartialRendering = value;
+ }
+
public void useParametersFrom(FilterRepresentation a) {
}
import android.graphics.Bitmap;
import android.graphics.Matrix;
+import android.widget.Toast;
import com.android.gallery3d.R;
+import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.editors.BasicEditor;
import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
import com.android.gallery3d.filtershow.presets.ImagePreset;
protected String mName = "Original";
private final String LOGTAG = "ImageFilter";
+ // TODO: Temporary, for dogfood note memory issues with toasts for better
+ // feedback. Remove this when filters actually work in low memory
+ // situations.
+ private static FilterShowActivity sActivity = null;
+
+ public static void setActivityForMemoryToasts(FilterShowActivity activity) {
+ sActivity = activity;
+ }
+
+ public static void resetStatics() {
+ sActivity = null;
+ }
+
+ public void displayLowMemoryToast() {
+ if (sActivity != null) {
+ sActivity.runOnUiThread(new Runnable() {
+ public void run() {
+ Toast.makeText(sActivity, "Memory too low for filter " + getName() +
+ ", please file a bug report", Toast.LENGTH_SHORT).show();
+ }
+ });
+ }
+ }
+
public void setName(String name) {
mName = name;
}
}
/**
- * Called on small bitmaps to create button icons for each filter.
- * Override this to provide filter-specific button icons.
+ * Called on small bitmaps to create button icons for each filter. Override
+ * this to provide filter-specific button icons.
*/
public Bitmap iconApply(Bitmap bitmap, float scaleFactor, int quality) {
return apply(bitmap, scaleFactor, quality);
representation.setMinimum(-180);
representation.setTextId(R.string.bwfilter);
representation.setButtonId(R.id.bwfilterButton);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setFilterClass(ImageFilterEdge.class);
representation.setTextId(R.string.edge);
representation.setButtonId(R.id.edgeButton);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setTextId(R.string.hue);
representation.setButtonId(R.id.hueButton);
representation.setEditorId(BasicEditor.ID);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setPreviewValue(4);
representation.setTextId(R.string.kmeans);
representation.setButtonId(R.id.kmeansButton);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setShowEditingControls(false);
representation.setShowParameterValue(false);
representation.setEditorId(ImageOnlyEditor.ID);
+ representation.setSupportsPartialRendering(true);
return representation;
}
|| (bitmap.getHeight() != sOldBitmap.getHeight())) {
if (mInPixelsAllocation != null) {
mInPixelsAllocation.destroy();
+ mInPixelsAllocation = null;
}
if (mOutPixelsAllocation != null) {
mOutPixelsAllocation.destroy();
+ mOutPixelsAllocation = null;
}
Bitmap bitmapBuffer = bitmap.copy(mBitmapConfig, true);
mOutPixelsAllocation = Allocation.createFromBitmap(mRS, bitmapBuffer,
Log.e(LOGTAG, "Illegal argument? " + e);
} catch (android.renderscript.RSRuntimeException e) {
Log.e(LOGTAG, "RS runtime exception ? " + e);
+ } catch (java.lang.OutOfMemoryError e) {
+ // Many of the renderscript filters allocated large (>16Mb resources) in order to apply.
+ System.gc();
+ displayLowMemoryToast();
+ Log.e(LOGTAG, "not enough memory for filter " + getName(), e);
}
return bitmap;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setTextId(R.string.sharpness);
representation.setButtonId(R.id.sharpenButton);
representation.setOverlayId(R.drawable.filtershow_button_colors_sharpen);
- representation.setEditorId(R.id.imageZoom);
+ representation.setEditorId(R.id.imageShow);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setMinimum(-100);
representation.setMaximum(100);
representation.setDefaultValue(0);
+ representation.setSupportsPartialRendering(true);
return representation;
}
representation.setShowEditingControls(false);
representation.setShowParameterValue(false);
representation.setEditorId(ImageOnlyEditor.ID);
+ representation.setSupportsPartialRendering(true);
return representation;
}
public ImageDraw(Context context, AttributeSet attrs) {
super(context, attrs);
resetParameter();
+ super.setOriginalDisabled(true);
}
public ImageDraw(Context context) {
super(context);
resetParameter();
+ super.setOriginalDisabled(true);
}
public void setEditor(EditorDraw editorDraw) {
float[] mTmpPoint = new float[2]; // so we do not malloc
@Override
public boolean onTouchEvent(MotionEvent event) {
- super.onTouchEvent(event);
-
- if (event.getPointerCount() != 1) {
- return true;
+ boolean ret = super.onTouchEvent(event);
+ if (event.getPointerCount() > 1) {
+ if (mFRep.getCurrentDrawing() != null) {
+ mFRep.clearCurrentSection();
+ mEditorDraw.commitLocalRepresentation();
+ }
+ return ret;
}
-
- if (didFinishScalingOperation()) {
- return true;
+ if (event.getAction() != MotionEvent.ACTION_DOWN) {
+ if (mFRep.getCurrentDrawing() == null) {
+ return ret;
+ }
}
ImageFilterDraw filter = (ImageFilterDraw) getCurrentFilter();
if (event.getAction() == MotionEvent.ACTION_DOWN) {
+ calcScreenMapping();
mTmpPoint[0] = event.getX();
mTmpPoint[1] = event.getY();
mToOrig.mapPoints(mTmpPoint);
mFRep.startNewSection(mType, mCurrentColor, mCurrentSize, mTmpPoint[0], mTmpPoint[1]);
-
}
if (event.getAction() == MotionEvent.ACTION_MOVE) {
+
int historySize = event.getHistorySize();
final int pointerCount = event.getPointerCount();
for (int h = 0; h < historySize; h++) {
return true;
}
- Matrix mRotateToScreen;
- Matrix mToScreen;
- Matrix mToOrig = new Matrix();
+ Matrix mRotateToScreen = new Matrix();
+ Matrix mToOrig;
private void calcScreenMapping() {
-
- GeometryMetadata geo = getImagePreset().mGeoData;
- mToScreen = geo.getOriginalToScreen(false,
- mImageLoader.getOriginalBounds().width(),
- mImageLoader.getOriginalBounds().height(), getWidth(), getHeight());
- mRotateToScreen = geo.getOriginalToScreen(true,
- mImageLoader.getOriginalBounds().width(),
- mImageLoader.getOriginalBounds().height(), getWidth(), getHeight());
- mRotateToScreen.invert(mToOrig);
+ mToOrig = getScreenToImageMatrix(true);
mToOrig.invert(mRotateToScreen);
}
import android.net.Uri;
import android.os.Handler;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.*;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.PanelController;
import com.android.gallery3d.filtershow.cache.ImageLoader;
+import com.android.gallery3d.filtershow.cache.RenderingRequestCaller;
import com.android.gallery3d.filtershow.filters.ImageFilter;
import com.android.gallery3d.filtershow.presets.ImagePreset;
private ScaleGestureDetector mScaleGestureDetector = null;
protected Rect mImageBounds = new Rect();
-
+ private boolean mOriginalDisabled = false;
private boolean mTouchShowOriginal = false;
private long mTouchShowOriginalDate = 0;
private final long mTouchShowOriginalDelayMin = 200; // 200ms
*/
protected Matrix getImageToScreenMatrix(boolean reflectRotation) {
GeometryMetadata geo = getImagePreset().mGeoData;
+ if (geo == null || mImageLoader == null
+ || mImageLoader.getOriginalBounds() == null) {
+ return new Matrix();
+ }
Matrix m = geo.getOriginalToScreen(reflectRotation,
mImageLoader.getOriginalBounds().width(),
mImageLoader.getOriginalBounds().height(), getWidth(), getHeight());
@Override
public void onDraw(Canvas canvas) {
-
+ MasterImage.getImage().setImageShowSize(getWidth(), getHeight());
canvas.save();
// TODO: center scale on gesture
float cx = canvas.getWidth()/2.0f;
1.5f * mTextPadding, mPaint);
}
+ Bitmap partialPreview = MasterImage.getImage().getPartialImage();
+ if (partialPreview != null) {
+ Rect src = new Rect(0, 0, partialPreview.getWidth(), partialPreview.getHeight());
+ Rect dest = new Rect(0, 0, getWidth(), getHeight());
+ canvas.drawBitmap(partialPreview, src, dest, mPaint);
+ }
drawToast(canvas);
}
return mScaleGestureDetector.isInProgress();
}
+ protected boolean isOriginalDisabled() {
+ return mOriginalDisabled;
+ }
+
+ protected void setOriginalDisabled(boolean originalDisabled) {
+ mOriginalDisabled = originalDisabled;
+ }
+
@Override
public boolean onTouchEvent(MotionEvent event) {
super.onTouchEvent(event);
Point translation = MasterImage.getImage().getTranslation();
translation.x = (int) (originalTranslation.x + translateX);
translation.y = (int) (originalTranslation.y + translateY);
+ MasterImage.getImage().setTranslation(translation);
}
- } else if (!mActivity.isShowingHistoryPanel()
+ } else if (!mOriginalDisabled && !mActivity.isShowingHistoryPanel()
&& (System.currentTimeMillis() - mTouchShowOriginalDate
> mTouchShowOriginalDelayMin)
&& event.getPointerCount() == 1) {
@Override
public boolean onFling(MotionEvent startEvent, MotionEvent endEvent, float arg2, float arg3) {
+ if (mActivity == null) {
+ return false;
+ }
if ((!mActivity.isShowingHistoryPanel() && startEvent.getX() > endEvent.getX())
|| (mActivity.isShowingHistoryPanel() && endEvent.getX() > startEvent.getX())) {
if (!mTouchShowOriginal
}
return false;
}
+
}
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.util.AttributeSet;
+import android.util.Log;
import android.view.MotionEvent;
import com.android.gallery3d.filtershow.editors.EditorVignette;
@Override
public boolean onTouchEvent(MotionEvent event) {
int mask = event.getActionMasked();
- if (MotionEvent.ACTION_UP == mask) {
- mActiveHandle = -1;
- }
- if (MotionEvent.ACTION_DOWN == mask && event.getPointerCount() == 1) {
- mActiveHandle = mElipse.getCloseHandle(event.getX(), event.getY());
- }
- if (mActiveHandle == -1 || event.getPointerCount() > 1) {
- mActiveHandle = -1;
-
- return super.onTouchEvent(event);
+ if (mActiveHandle == -1) {
+ if (MotionEvent.ACTION_DOWN != mask) {
+ return super.onTouchEvent(event);
+ }
+ if (event.getPointerCount() == 1) {
+ mActiveHandle = mElipse.getCloseHandle(event.getX(), event.getY());
+ }
+ if (mActiveHandle == -1) {
+ return super.onTouchEvent(event);
+ }
+ } else {
+ switch (mask) {
+ case MotionEvent.ACTION_UP:
+ mActiveHandle = -1;
+ break;
+ case MotionEvent.ACTION_DOWN:
+ if (event.getPointerCount() == 1) {
+ Log.v(LOGTAG, "################### ACTION_DOWN odd " + mActiveHandle
+ + " touches=1");
+ }
+ break;
+ }
}
float x = event.getX();
float y = event.getY();
@Override
public void onDraw(Canvas canvas) {
super.onDraw(canvas);
- if (mElipse.isUndefined()) {
- setRepresentation(mVignetteRep);
- }
+ setRepresentation(mVignetteRep);
mElipse.draw(canvas);
}
Bitmap filteredImage = null;
if ((mZoomedIn || mTouchDown) && mImageLoader != null) {
filteredImage = mImageLoader.getScaleOneImageForPreset(this, getImagePreset(),
- mZoomBounds, false);
+ mZoomBounds, null, false);
} else {
filteredImage = getFilteredImage();
}
package com.android.gallery3d.filtershow.imageshow;
-import android.graphics.Bitmap;
-import android.graphics.Point;
-import android.graphics.RectF;
+import android.graphics.*;
import com.android.gallery3d.filtershow.FilterShowActivity;
import com.android.gallery3d.filtershow.HistoryAdapter;
private Bitmap mGeometryOnlyBitmap = null;
private Bitmap mFiltersOnlyBitmap = null;
+ private Bitmap mPartialBitmap = null;
private ImageLoader mLoader = null;
private HistoryAdapter mHistory = null;
private Point mTranslation = new Point();
private Point mOriginalTranslation = new Point();
+ private Point mImageShowSize = new Point();
+
private MasterImage() {
}
return mGeometryOnlyBitmap;
}
+ public Bitmap getPartialImage() {
+ return mPartialBitmap;
+ }
+
public void notifyObservers() {
for (ImageShow observer : mObservers) {
observer.invalidate();
}
}
invalidatePreview();
+ needsUpdateFullResPreview();
mActivity.enableSave(hasModifications());
}
updatePresets(false);
}
+ public void invalidatePartialPreview() {
+ if (mPartialBitmap != null) {
+ mPartialBitmap = null;
+ notifyObservers();
+ }
+ }
+
public void invalidatePreview() {
mFilteredPreview.invalidate();
+ invalidatePartialPreview();
+ needsUpdateFullResPreview();
FilteringPipeline.getPipeline().updatePreviewBuffer();
}
+ public void setImageShowSize(int w, int h) {
+ if (mImageShowSize.x != w || mImageShowSize.y != h) {
+ mImageShowSize.set(w, h);
+ needsUpdateFullResPreview();
+ }
+ }
+
+ private Matrix getImageToScreenMatrix(boolean reflectRotation) {
+ GeometryMetadata geo = mPreset.mGeoData;
+ if (geo == null || mLoader == null
+ || mLoader.getOriginalBounds() == null
+ || mImageShowSize.x == 0) {
+ return new Matrix();
+ }
+ Matrix m = geo.getOriginalToScreen(reflectRotation,
+ mLoader.getOriginalBounds().width(),
+ mLoader.getOriginalBounds().height(), mImageShowSize.x, mImageShowSize.y);
+ Point translate = getTranslation();
+ float scaleFactor = getScaleFactor();
+ m.postTranslate(translate.x, translate.y);
+ m.postScale(scaleFactor, scaleFactor, mImageShowSize.x/2.0f, mImageShowSize.y/2.0f);
+ return m;
+ }
+
+ private Matrix getScreenToImageMatrix(boolean reflectRotation) {
+ Matrix m = getImageToScreenMatrix(reflectRotation);
+ Matrix invert = new Matrix();
+ m.invert(invert);
+ return invert;
+ }
+
+ public void needsUpdateFullResPreview() {
+ if (!mPreset.canDoPartialRendering()) {
+ invalidatePartialPreview();
+ return;
+ }
+ Matrix m = getScreenToImageMatrix(true);
+ RectF r = new RectF(0, 0, mImageShowSize.x, mImageShowSize.y);
+ RectF dest = new RectF();
+ m.mapRect(dest, r);
+ Rect bounds = new Rect();
+ dest.roundOut(bounds);
+ RenderingRequest.post(null, mPreset, RenderingRequest.PARTIAL_RENDERING,
+ this, bounds, new Rect(0, 0, mImageShowSize.x, mImageShowSize.y));
+ invalidatePartialPreview();
+ }
+
@Override
public void available(RenderingRequest request) {
if (request.getBitmap() == null) {
if (request.getType() == RenderingRequest.FILTERS_RENDERING) {
mFiltersOnlyBitmap = request.getBitmap();
}
+ if (request.getType() == RenderingRequest.PARTIAL_RENDERING) {
+ mPartialBitmap = request.getBitmap();
+ notifyObservers();
+ }
}
public static void reset() {
public void setScaleFactor(float scaleFactor) {
mScaleFactor = scaleFactor;
+ needsUpdateFullResPreview();
}
public Point getTranslation() {
}
public void setTranslation(Point translation) {
- mTranslation = translation;
+ mTranslation.x = translation.x;
+ mTranslation.y = translation.y;
+ needsUpdateFullResPreview();
}
public Point getOriginalTranslation() {
public void resetTranslation() {
mTranslation.x = 0;
mTranslation.y = 0;
+ needsUpdateFullResPreview();
}
}
package com.android.gallery3d.filtershow.presets;
import android.graphics.Bitmap;
+import android.graphics.Rect;
import android.util.Log;
import com.android.gallery3d.filtershow.ImageStateAdapter;
private boolean mDoApplyFilters = true;
public final GeometryMetadata mGeoData = new GeometryMetadata();
+ private boolean mPartialRendering = false;
+ private Rect mPartialRenderingBounds;
public ImagePreset() {
setup();
return bitmap;
}
+ public boolean canDoPartialRendering() {
+ if (mGeoData.hasModifications()) {
+ return false;
+ }
+ for (int i = 0; i < mFilters.size(); i++) {
+ FilterRepresentation representation = null;
+ synchronized (mFilters) {
+ representation = mFilters.elementAt(i);
+ }
+ if (!representation.supportsPartialRendering()) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public void fillImageStateAdapter(ImageStateAdapter imageStateAdapter) {
if (imageStateAdapter == null) {
return;
public void setScaleFactor(float value) {
mScaleFactor = value;
}
+
+ public void setPartialRendering(boolean partialRendering, Rect bounds) {
+ mPartialRendering = partialRendering;
+ mPartialRenderingBounds = bounds;
+ }
+
+ public boolean isPartialRendering() {
+ return mPartialRendering;
+ }
+
+ public Rect getPartialRenderingBounds() {
+ return mPartialRenderingBounds;
+ }
}
public void deviceRemoved(MtpDevice device) {
if (device == mDevice) {
setDevice(null);
- MtpBitmapFetch.onDeviceDisconnected(device);
}
}
import android.view.WindowManager;
import com.android.camera.Exif;
-import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
-
-import java.util.ArrayList;
+import com.android.photos.data.GalleryBitmapPool;
public class MtpBitmapFetch {
- private static final int BITMAP_POOL_SIZE = 32;
- private static BitmapPool sThumbnailPool = new BitmapPool(BITMAP_POOL_SIZE);
private static int sMaxSize = 0;
public static void recycleThumbnail(Bitmap b) {
if (b != null) {
- sThumbnailPool.recycle(b);
+ GalleryBitmapPool.getInstance().put(b);
}
}
o.inJustDecodeBounds = true;
BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.length, o);
if (o.outWidth == 0 || o.outHeight == 0) return null;
- o.inBitmap = sThumbnailPool.getBitmap(o.outWidth, o.outHeight);
+ o.inBitmap = GalleryBitmapPool.getInstance().get(o.outWidth, o.outHeight);
o.inMutable = true;
o.inJustDecodeBounds = false;
o.inSampleSize = 1;
return new BitmapWithMetadata(created, Exif.getOrientation(imageBytes));
}
- public static void onDeviceDisconnected(MtpDevice device) {
- sThumbnailPool.clear();
- }
-
public static void configureForContext(Context context) {
DisplayMetrics metrics = new DisplayMetrics();
WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
import android.text.TextUtils;
import com.android.gallery3d.R;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.DataSourceType;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.util.ThreadPool;
import com.android.gallery3d.util.ThreadPool.JobContext;
private final Context mContext;
private int mLabelWidth;
- private BitmapPool mBitmapPool;
+ private int mBitmapWidth;
+ private int mBitmapHeight;
private final LazyLoadedBitmap mLocalSetIcon;
private final LazyLoadedBitmap mPicasaIcon;
if (mLabelWidth == width) return;
mLabelWidth = width;
int borders = 2 * BORDER_SIZE;
- mBitmapPool = new BitmapPool(
- width + borders, mSpec.labelBackgroundHeight + borders, 16);
+ mBitmapWidth = width + borders;
+ mBitmapHeight = mSpec.labelBackgroundHeight + borders;
}
public ThreadPool.Job<Bitmap> requestLabel(
synchronized (this) {
labelWidth = mLabelWidth;
- bitmap = mBitmapPool.getBitmap();
+ bitmap = GalleryBitmapPool.getInstance().get(mBitmapWidth, mBitmapHeight);
}
if (bitmap == null) {
}
public void recycleLabel(Bitmap label) {
- mBitmapPool.recycle(label);
- }
-
- public void clearRecycledLabels() {
- if (mBitmapPool != null) mBitmapPool.clear();
+ GalleryBitmapPool.getInstance().put(label);
}
}
import com.android.gallery3d.app.AbstractGalleryActivity;
import com.android.gallery3d.app.AlbumSetDataLoader;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.DataSourceType;
import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.data.MediaObject;
for (int i = mContentStart, n = mContentEnd; i < n; ++i) {
freeSlotContent(i);
}
- mLabelMaker.clearRecycledLabels();
}
public void resume() {
}
@Override
- protected void recycleBitmap(Bitmap bitmap) {
- BitmapPool pool = MediaItem.getMicroThumbPool();
- if (pool != null) pool.recycle(bitmap);
- }
-
- @Override
protected Future<Bitmap> submitBitmapTask(FutureListener<Bitmap> l) {
return mThreadPool.submit(mMediaItem.requestImage(
MediaItem.TYPE_MICROTHUMBNAIL), l);
}
@Override
- protected void recycleBitmap(Bitmap bitmap) {
- mLabelMaker.recycleLabel(bitmap);
- }
-
- @Override
protected void onLoadComplete(Bitmap bitmap) {
mHandler.obtainMessage(MSG_UPDATE_ALBUM_ENTRY, this).sendToTarget();
}
import com.android.gallery3d.app.AbstractGalleryActivity;
import com.android.gallery3d.app.AlbumDataLoader;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.data.MediaObject;
-import com.android.gallery3d.data.Path;
import com.android.gallery3d.data.MediaObject.PanoramaSupportCallback;
+import com.android.gallery3d.data.Path;
import com.android.gallery3d.glrenderer.Texture;
import com.android.gallery3d.glrenderer.TiledTexture;
import com.android.gallery3d.util.Future;
}
@Override
- protected void recycleBitmap(Bitmap bitmap) {
- BitmapPool pool = MediaItem.getMicroThumbPool();
- if (pool != null) pool.recycle(bitmap);
- }
-
- @Override
protected Future<Bitmap> submitBitmapTask(FutureListener<Bitmap> l) {
return mThreadPool.submit(
mItem.requestImage(MediaItem.TYPE_MICROTHUMBNAIL), this);
import android.graphics.Bitmap;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.util.Future;
import com.android.gallery3d.util.FutureListener;
mBitmap = future.get();
if (mState == STATE_RECYCLED) {
if (mBitmap != null) {
- recycleBitmap(mBitmap);
+ GalleryBitmapPool.getInstance().put(mBitmap);
mBitmap = null;
}
return; // don't call callback
public synchronized void recycle() {
mState = STATE_RECYCLED;
if (mBitmap != null) {
- recycleBitmap(mBitmap);
+ GalleryBitmapPool.getInstance().put(mBitmap);
mBitmap = null;
}
if (mTask != null) mTask.cancel();
}
abstract protected Future<Bitmap> submitBitmapTask(FutureListener<Bitmap> l);
- abstract protected void recycleBitmap(Bitmap bitmap);
abstract protected void onLoadComplete(Bitmap bitmap);
}
import android.graphics.Canvas;
import com.android.gallery3d.common.BitmapUtils;
-import com.android.gallery3d.data.BitmapPool;
+import com.android.photos.data.GalleryBitmapPool;
import java.util.ArrayList;
}
@Override
- public Bitmap getTile(int level, int x, int y, int tileSize,
- BitmapPool pool) {
+ public Bitmap getTile(int level, int x, int y, int tileSize) {
x >>= level;
y >>= level;
- Bitmap result = pool == null ? null : pool.getBitmap();
+ Bitmap result = GalleryBitmapPool.getInstance().get(tileSize, tileSize);
if (result == null) {
result = Bitmap.createBitmap(tileSize, tileSize, mConfig);
} else {
import android.view.WindowManager;
import com.android.gallery3d.app.GalleryContext;
-import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
import com.android.gallery3d.data.DecodeUtils;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.glrenderer.GLCanvas;
import com.android.gallery3d.glrenderer.UploadedTexture;
import com.android.gallery3d.util.Future;
// TILE_SIZE must be 2^N
private static int sTileSize;
- private static BitmapPool sTilePool;
-
/*
* This is the tile state in the CPU side.
* Life of a Tile:
// still refers to the coordinate on the original image.
//
// The method would be called in another thread.
- public Bitmap getTile(int level, int x, int y, int tileSize,
- BitmapPool pool);
+ public Bitmap getTile(int level, int x, int y, int tileSize);
}
public static boolean isHighResolution(Context context) {
} else {
sTileSize = 256;
}
- sTilePool =
- ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_REGION_DECODER
- ? new BitmapPool(sTileSize, sTileSize, 128)
- : null;
}
}
}
}
setScreenNail(null);
- if (sTilePool != null) sTilePool.clear();
}
public void prepareTextures() {
if (tile.mTileState == STATE_RECYCLING) {
tile.mTileState = STATE_RECYCLED;
if (tile.mDecodedTile != null) {
- if (sTilePool != null) sTilePool.recycle(tile.mDecodedTile);
+ GalleryBitmapPool.getInstance().put(tile.mDecodedTile);
tile.mDecodedTile = null;
}
mRecycledQueue.push(tile);
}
tile.mTileState = STATE_RECYCLED;
if (tile.mDecodedTile != null) {
- if (sTilePool != null) sTilePool.recycle(tile.mDecodedTile);
+ GalleryBitmapPool.getInstance().put(tile.mDecodedTile);
tile.mDecodedTile = null;
}
mRecycledQueue.push(tile);
@Override
protected void onFreeBitmap(Bitmap bitmap) {
- if (sTilePool != null) sTilePool.recycle(bitmap);
+ GalleryBitmapPool.getInstance().put(bitmap);
}
boolean decode() {
// by (1 << mTilelevel) from a region in the original image.
try {
mDecodedTile = DecodeUtils.ensureGLCompatibleBitmap(mModel.getTile(
- mTileLevel, mX, mY, sTileSize, sTilePool));
+ mTileLevel, mX, mY, sTileSize));
} catch (Throwable t) {
Log.w(TAG, "fail to decode tile", t);
}
import com.android.gallery3d.common.ApiHelper;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
+import com.android.photos.data.GalleryBitmapPool;
public class TileImageViewAdapter implements TileImageView.TileSource {
private static final String TAG = "TileImageViewAdapter";
// (44, 44, 256, 256) from the original photo and down sample it to 106.
@TargetApi(ApiHelper.VERSION_CODES.HONEYCOMB)
@Override
- public Bitmap getTile(int level, int x, int y, int tileSize, BitmapPool pool) {
+ public Bitmap getTile(int level, int x, int y, int tileSize) {
if (!ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_REGION_DECODER) {
return getTileWithoutReusingBitmap(level, x, y, tileSize);
}
.contains(wantRegion);
}
- Bitmap bitmap = pool == null ? null : pool.getBitmap();
+ Bitmap bitmap = GalleryBitmapPool.getInstance().get(tileSize, tileSize);
if (bitmap != null) {
if (needClear) bitmap.eraseColor(0);
} else {
}
} finally {
if (options.inBitmap != bitmap && options.inBitmap != null) {
- if (pool != null) pool.recycle(options.inBitmap);
+ GalleryBitmapPool.getInstance().put(options.inBitmap);
options.inBitmap = null;
}
}
import android.graphics.RectF;
import com.android.gallery3d.common.Utils;
-import com.android.gallery3d.data.BitmapPool;
-import com.android.gallery3d.data.MediaItem;
+import com.android.photos.data.GalleryBitmapPool;
import com.android.gallery3d.glrenderer.GLCanvas;
import com.android.gallery3d.glrenderer.TiledTexture;
mHeight = Math.round(scale * height);
}
- private static void recycleBitmap(BitmapPool pool, Bitmap bitmap) {
- if (pool == null || bitmap == null) return;
- pool.recycle(bitmap);
- }
-
// Combines the two ScreenNails.
// Returns the used one and recycle the unused one.
public ScreenNail combine(ScreenNail other) {
mWidth = newer.mWidth;
mHeight = newer.mHeight;
if (newer.mTexture != null) {
- recycleBitmap(MediaItem.getThumbPool(), mBitmap);
+ if (mBitmap != null) GalleryBitmapPool.getInstance().put(mBitmap);
if (mTexture != null) mTexture.recycle();
mBitmap = newer.mBitmap;
mTexture = newer.mTexture;
mTexture.recycle();
mTexture = null;
}
- recycleBitmap(MediaItem.getThumbPool(), mBitmap);
- mBitmap = null;
+ if (mBitmap != null) {
+ GalleryBitmapPool.getInstance().put(mBitmap);
+ mBitmap = null;
+ }
}
public static void disableDrawPlaceholder() {
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos;
+
+import android.app.Fragment;
+
+
+public class AlbumSetFragment extends Fragment {
+
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos;
+
+import android.app.ActionBar;
+import android.app.ActionBar.Tab;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.android.camera.CameraActivity;
+import com.android.gallery3d.R;
+
+public class GalleryActivity extends Activity {
+
+ private final String FTAG_PHOTOSET = "PhotoSet";
+ private final String FTAG_ALBUMSET = "AlbumSet";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setupActionBar();
+ }
+
+ private void setupActionBar() {
+ ActionBar ab = getActionBar();
+ ab.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+ ab.setDisplayShowHomeEnabled(false);
+ ab.setDisplayShowTitleEnabled(false);
+ Tab tab = ab.newTab();
+ tab.setText(R.string.tab_photos);
+ tab.setTabListener(new TabListener<PhotoSetFragment>(this,
+ FTAG_PHOTOSET, PhotoSetFragment.class));
+ ab.addTab(tab, true);
+ tab = ab.newTab();
+ tab.setText(R.string.tab_albums);
+ tab.setTabListener(new TabListener<AlbumSetFragment>(this,
+ FTAG_ALBUMSET, AlbumSetFragment.class));
+ ab.addTab(tab);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.gallery, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.menu_camera:
+ Intent intent = new Intent(this, CameraActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ startActivity(intent);
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ private static class TabListener<T extends Fragment> implements ActionBar.TabListener {
+ private Fragment mFragment;
+ private final Activity mActivity;
+ private final String mTag;
+ private final Class<T> mClass;
+
+ /** Constructor used each time a new tab is created.
+ * @param activity The host Activity, used to instantiate the fragment
+ * @param tag The identifier tag for the fragment
+ * @param clz The fragment's Class, used to instantiate the fragment
+ */
+ public TabListener(Activity activity, String tag, Class<T> clz) {
+ mActivity = activity;
+ mTag = tag;
+ mClass = clz;
+ }
+
+ /* The following are each of the ActionBar.TabListener callbacks */
+
+ @Override
+ public void onTabSelected(Tab tab, FragmentTransaction ft) {
+ // Check if the fragment is already initialized
+ if (mFragment == null) {
+ // If not, instantiate and add it to the activity
+ mFragment = Fragment.instantiate(mActivity, mClass.getName());
+ ft.add(android.R.id.content, mFragment, mTag);
+ } else {
+ // If it exists, simply attach it in order to show it
+ ft.attach(mFragment);
+ }
+ }
+
+ @Override
+ public void onTabUnselected(Tab tab, FragmentTransaction ft) {
+ if (mFragment != null) {
+ // Detach the fragment, because another one is being attached
+ ft.detach(mFragment);
+ }
+ }
+
+ @Override
+ public void onTabReselected(Tab tab, FragmentTransaction ft) {
+ // User selected the already selected tab. Usually do nothing.
+ }
+ }
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+
+package com.android.photos;
+
+import android.app.Fragment;
+
+
+public class PhotoFragment extends Fragment {
+
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos;
+
+import android.app.Fragment;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Loader;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.provider.MediaStore.Files.FileColumns;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+
+import com.android.gallery3d.R;
+import com.android.photos.data.PhotoSetLoader;
+
+
+public class PhotoSetFragment extends Fragment implements LoaderCallbacks<Cursor> {
+
+ private static final int LOADER_PHOTOSET = 1;
+
+ private ListView mPhotoSetView;
+ private View mEmptyView;
+ private CursorAdapter mAdapter;
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View root = inflater.inflate(R.layout.photo_set, container, false);
+ mPhotoSetView = (ListView) root.findViewById(android.R.id.list);
+ mEmptyView = root.findViewById(android.R.id.empty);
+ mEmptyView.setVisibility(View.GONE);
+ mAdapter = new SimpleCursorAdapter(getActivity(),
+ android.R.layout.simple_list_item_1, null,
+ new String[] { FileColumns.DATA },
+ new int[] { android.R.id.text1 }, 0);
+ mPhotoSetView.setAdapter(mAdapter);
+ getLoaderManager().initLoader(LOADER_PHOTOSET, null, this);
+ updateEmptyStatus();
+ return root;
+ }
+
+ private void updateEmptyStatus() {
+ boolean empty = (mAdapter == null || mAdapter.getCount() == 0);
+ mPhotoSetView.setVisibility(empty ? View.GONE : View.VISIBLE);
+ mEmptyView.setVisibility(empty ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
+ public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+ return new PhotoSetLoader(getActivity());
+ }
+
+ @Override
+ public void onLoadFinished(Loader<Cursor> loader,
+ Cursor data) {
+ mAdapter.swapCursor(data);
+ updateEmptyStatus();
+ }
+
+ @Override
+ public void onLoaderReset(Loader<Cursor> loader) {
+ }
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos.data;
+
+import android.graphics.Bitmap;
+import android.graphics.Point;
+import android.util.Pools.Pool;
+import android.util.Pools.SimplePool;
+
+import com.android.photos.data.SparseArrayBitmapPool.Node;
+
+public class GalleryBitmapPool {
+
+ private static final int CAPACITY_BYTES = 20971520;
+ private static final int POOL_INDEX_NONE = -1;
+ private static final int POOL_INDEX_SQUARE = 0;
+ private static final int POOL_INDEX_PHOTO = 1;
+ private static final int POOL_INDEX_MISC = 2;
+
+ private static final Point[] COMMON_PHOTO_ASPECT_RATIOS =
+ { new Point(4, 3), new Point(3, 2), new Point(16, 9) };
+
+ private int mCapacityBytes;
+ private SparseArrayBitmapPool [] mPools;
+ private Pool<Node> mSharedNodePool = new SimplePool<Node>(128);
+
+ private GalleryBitmapPool(int capacityBytes) {
+ mPools = new SparseArrayBitmapPool[3];
+ mPools[POOL_INDEX_SQUARE] = new SparseArrayBitmapPool(capacityBytes / 3, mSharedNodePool);
+ mPools[POOL_INDEX_PHOTO] = new SparseArrayBitmapPool(capacityBytes / 3, mSharedNodePool);
+ mPools[POOL_INDEX_MISC] = new SparseArrayBitmapPool(capacityBytes / 3, mSharedNodePool);
+ mCapacityBytes = capacityBytes;
+ }
+
+ private static GalleryBitmapPool sInstance;
+ public static GalleryBitmapPool getInstance() {
+ if (sInstance == null) {
+ sInstance = new GalleryBitmapPool(CAPACITY_BYTES);
+ }
+ return sInstance;
+ }
+
+ private SparseArrayBitmapPool getPoolForDimensions(int width, int height) {
+ int index = getPoolIndexForDimensions(width, height);
+ if (index == POOL_INDEX_NONE) {
+ return null;
+ } else {
+ return mPools[index];
+ }
+ }
+
+ private int getPoolIndexForDimensions(int width, int height) {
+ if (width <= 0 || height <= 0) {
+ return POOL_INDEX_NONE;
+ }
+ if (width == height) {
+ return POOL_INDEX_SQUARE;
+ }
+ int min, max;
+ if (width > height) {
+ min = height;
+ max = width;
+ } else {
+ min = width;
+ max = height;
+ }
+ for (Point ar : COMMON_PHOTO_ASPECT_RATIOS) {
+ if (min * ar.x == max * ar.y) {
+ return POOL_INDEX_PHOTO;
+ }
+ }
+ return POOL_INDEX_MISC;
+ }
+
+ public synchronized int getCapacity() {
+ return mCapacityBytes;
+ }
+
+ public synchronized int getSize() {
+ int total = 0;
+ for (SparseArrayBitmapPool p : mPools) {
+ total += p.getSize();
+ }
+ return total;
+ }
+
+ public Bitmap get(int width, int height) {
+ SparseArrayBitmapPool pool = getPoolForDimensions(width, height);
+ if (pool == null) {
+ return null;
+ } else {
+ return pool.get(width, height);
+ }
+ }
+
+ public boolean put(Bitmap b) {
+ if (b == null) {
+ return false;
+ }
+ SparseArrayBitmapPool pool = getPoolForDimensions(b.getWidth(), b.getHeight());
+ if (pool == null) {
+ b.recycle();
+ return false;
+ } else {
+ return pool.put(b);
+ }
+ }
+
+ public void clear() {
+ for (SparseArrayBitmapPool p : mPools) {
+ p.clear();
+ }
+ }
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos.data;
+
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+
+import com.android.gallery3d.data.ContentListener;
+import com.android.gallery3d.data.DataManager;
+import com.android.gallery3d.data.MediaSet;
+import com.android.gallery3d.data.MediaSet.SyncListener;
+import com.android.gallery3d.util.Future;
+
+/**
+ * Proof of concept, don't use
+ */
+public class MediaSetLoader extends AsyncTaskLoader<MediaSet> {
+
+ private static final SyncListener sNullListener = new SyncListener() {
+ @Override
+ public void onSyncDone(MediaSet mediaSet, int resultCode) {
+ }
+ };
+
+ private MediaSet mMediaSet;
+ private Future<Integer> mSyncTask = null;
+ private ContentListener mObserver = new ContentListener() {
+ @Override
+ public void onContentDirty() {
+ onContentChanged();
+ }
+ };
+
+ public MediaSetLoader(Context context, String path) {
+ super(context);
+ mMediaSet = DataManager.from(getContext()).getMediaSet(path);
+ }
+
+ @Override
+ protected void onStartLoading() {
+ super.onStartLoading();
+ mMediaSet.addContentListener(mObserver);
+ mSyncTask = mMediaSet.requestSync(sNullListener);
+ forceLoad();
+ }
+
+ @Override
+ protected boolean onCancelLoad() {
+ if (mSyncTask != null) {
+ mSyncTask.cancel();
+ mSyncTask = null;
+ }
+ return super.onCancelLoad();
+ }
+
+ @Override
+ protected void onStopLoading() {
+ super.onStopLoading();
+ cancelLoad();
+ mMediaSet.removeContentListener(mObserver);
+ }
+
+ @Override
+ protected void onReset() {
+ super.onReset();
+ onStopLoading();
+ }
+
+ @Override
+ public MediaSet loadInBackground() {
+ mMediaSet.loadIfDirty();
+ return mMediaSet;
+ }
+
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos.data;
+
+import android.content.Context;
+import android.content.CursorLoader;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.provider.MediaStore.Files;
+import android.provider.MediaStore.Files.FileColumns;
+
+public class PhotoSetLoader extends CursorLoader {
+
+ private static final Uri CONTENT_URI = Files.getContentUri("external");
+ private static final String[] PROJECTION = new String[] {
+ FileColumns._ID,
+ FileColumns.DATA,
+ FileColumns.WIDTH,
+ FileColumns.HEIGHT,
+ FileColumns.DATE_ADDED,
+ FileColumns.MEDIA_TYPE,
+ };
+ private static final String SORT_ORDER = FileColumns.DATE_ADDED + " DESC";
+ private static final String SELECTION =
+ FileColumns.MEDIA_TYPE + " == " + FileColumns.MEDIA_TYPE_IMAGE
+ + " OR "
+ + FileColumns.MEDIA_TYPE + " == " + FileColumns.MEDIA_TYPE_VIDEO;
+
+ public static final int INDEX_ID = 0;
+ public static final int INDEX_DATA = 1;
+ public static final int INDEX_WIDTH = 2;
+ public static final int INDEX_HEIGHT = 3;
+ public static final int INDEX_DATE_ADDED = 4;
+ public static final int INDEX_MEDIA_TYPE = 5;
+
+ private static final Uri GLOBAL_CONTENT_URI = Uri.parse("content://" + MediaStore.AUTHORITY + "/external/");
+ private final ContentObserver mGlobalObserver = new ForceLoadContentObserver();
+
+ public PhotoSetLoader(Context context) {
+ super(context, CONTENT_URI, PROJECTION, SELECTION, null, SORT_ORDER);
+ }
+
+ @Override
+ protected void onStartLoading() {
+ super.onStartLoading();
+ getContext().getContentResolver().registerContentObserver(GLOBAL_CONTENT_URI,
+ true, mGlobalObserver);
+ }
+
+ @Override
+ protected void onReset() {
+ super.onReset();
+ getContext().getContentResolver().unregisterContentObserver(mGlobalObserver);
+ }
+}
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.photos.data;
+
+import android.graphics.Bitmap;
+import android.util.SparseArray;
+
+import android.util.Pools.Pool;
+
+public class SparseArrayBitmapPool {
+
+ private static final int BITMAPS_TO_KEEP_AFTER_UNNEEDED_HINT = 4;
+ private int mCapacityBytes;
+ private SparseArray<Node> mStore = new SparseArray<Node>();
+ private int mSizeBytes = 0;
+
+ private Pool<Node> mNodePool;
+ private Node mPoolNodesHead = null;
+ private Node mPoolNodesTail = null;
+
+ protected static class Node {
+ Bitmap bitmap;
+ Node prevInBucket;
+ Node nextInBucket;
+ Node nextInPool;
+ Node prevInPool;
+ }
+
+ public SparseArrayBitmapPool(int capacityBytes, Pool<Node> nodePool) {
+ mCapacityBytes = capacityBytes;
+ mNodePool = nodePool;
+ }
+
+ public synchronized void setCapacity(int capacityBytes) {
+ mCapacityBytes = capacityBytes;
+ freeUpCapacity(0);
+ }
+
+ private void freeUpCapacity(int bytesNeeded) {
+ int targetSize = mCapacityBytes - bytesNeeded;
+ while (mPoolNodesTail != null && mSizeBytes > targetSize) {
+ unlinkAndRecycleNode(mPoolNodesTail, true);
+ }
+ }
+
+ private void unlinkAndRecycleNode(Node n, boolean recycleBitmap) {
+ // Remove the node from its spot in its bucket
+ if (n.prevInBucket != null) {
+ n.prevInBucket.nextInBucket = n.nextInBucket;
+ } else {
+ mStore.put(n.bitmap.getWidth(), n.nextInBucket);
+ }
+ if (n.nextInBucket != null) {
+ n.nextInBucket.prevInBucket = n.prevInBucket;
+ }
+
+ // Remove the node from its spot in the list of pool nodes
+ if (n.prevInPool != null) {
+ n.prevInPool.nextInPool = n.nextInPool;
+ } else {
+ mPoolNodesHead = n.nextInPool;
+ }
+ if (n.nextInPool != null) {
+ n.nextInPool.prevInPool = n.prevInPool;
+ } else {
+ mPoolNodesTail = n.prevInPool;
+ }
+
+ // Recycle the node
+ n.nextInBucket = null;
+ n.nextInPool = null;
+ n.prevInBucket = null;
+ n.prevInPool = null;
+ mSizeBytes -= n.bitmap.getByteCount();
+ if (recycleBitmap) n.bitmap.recycle();
+ n.bitmap = null;
+ mNodePool.release(n);
+ }
+
+ public synchronized int getCapacity() {
+ return mCapacityBytes;
+ }
+
+ public synchronized int getSize() {
+ return mSizeBytes;
+ }
+
+ public synchronized Bitmap get(int width, int height) {
+ Node cur = mStore.get(width);
+ while (cur != null) {
+ if (cur.bitmap.getHeight() == height) {
+ Bitmap b = cur.bitmap;
+ unlinkAndRecycleNode(cur, false);
+ return b;
+ }
+ cur = cur.nextInBucket;
+ }
+ return null;
+ }
+
+ public synchronized boolean put(Bitmap b) {
+ if (b == null) {
+ return false;
+ }
+ int bytes = b.getByteCount();
+ freeUpCapacity(bytes);
+ Node newNode = mNodePool.acquire();
+ if (newNode == null) {
+ newNode = new Node();
+ }
+ newNode.bitmap = b;
+ newNode.prevInBucket = null;
+ newNode.prevInPool = null;
+ newNode.nextInPool = mPoolNodesHead;
+ mPoolNodesHead = newNode;
+ int key = b.getWidth();
+ newNode.nextInBucket = mStore.get(key);
+ if (newNode.nextInBucket != null) {
+ newNode.nextInBucket.prevInBucket = newNode;
+ }
+ mStore.put(key, newNode);
+ if (newNode.nextInPool == null) {
+ mPoolNodesTail = newNode;
+ }
+ mSizeBytes += bytes;
+ return true;
+ }
+
+ public synchronized void clear() {
+ freeUpCapacity(mCapacityBytes);
+ }
+}
OSDN Git Service
