LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am e4ddc394: am 59b2923c: am 7d1b833e: fixing build

Browse Source 
Merge commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf'

* commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf':
  fixing build
This commit is contained in:
Megha Joshi
2009-12-04 04:22:09 -08:00
committed by Android Git Automerger
parent a827f32ed3 e4ddc394fa
commit 0ab8f1045d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ApiDemos/res/layout/wallpaper_2.xml
View File

@@ -15,13 +15,13 @@
android:id="@+id/randomize" android:id="@+id/randomize"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Randomize" android:text="@string/randomize"
android:layout_gravity="bottom" /> android:layout_gravity="bottom" />
<Button <Button
android:id="@+id/setwallpaper" android:id="@+id/setwallpaper"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Set Wallpaper" android:text="@string/set_wallpaper"
android:layout_gravity="bottom" /> android:layout_gravity="bottom" />
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

3
samples/ApiDemos/res/values/strings.xml
View File

@@ -40,7 +40,8 @@
<string name="activity_wallpaper">App/Activity/Wallpaper</string> <string name="activity_wallpaper">App/Activity/Wallpaper</string>
<string name="activity_setwallpaper">App/Activity/SetWallpaper</string> <string name="activity_setwallpaper">App/Activity/SetWallpaper</string>
<string name="randomize">Randomize</string>
<string name="set_wallpaper">Set Wallpaper</string>
<string name="activity_translucent">App/Activity/Translucent</string> <string name="activity_translucent">App/Activity/Translucent</string>
<string name="translucent_background">Example of how you can make an <string name="translucent_background">Example of how you can make an
activity have a translucent background, compositing over activity have a translucent background, compositing over