diff options
author | Daniel Sandler <dsandler@google.com> | 2009-10-19 15:51:50 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2009-10-19 15:56:00 -0400 |
commit | 29f17b97f4cb80706e19ab3728a94391947848bd (patch) | |
tree | 87e9907e4aa23e082dc46cdb5b2b251868555a91 /src | |
parent | a824765c2311549481cc38e831a74baf3a28a135 (diff) | |
download | android_packages_wallpapers_LivePicker-29f17b97f4cb80706e19ab3728a94391947848bd.tar.gz android_packages_wallpapers_LivePicker-29f17b97f4cb80706e19ab3728a94391947848bd.tar.bz2 android_packages_wallpapers_LivePicker-29f17b97f4cb80706e19ab3728a94391947848bd.zip |
Incorporate UX feedback into Live Wallpaper picker.
- "Configure..." button is hidden when unavailable
- Reorder buttons: Set on left, Configure on right
- Change "Configure..." to "Settings..." for consistency
with rest of system
Also fixes http://b/issue?id=2167421 by setting wallpaper
offsets to (0.5, 0) when attaching a new wallpaper.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java index 0cd60bb..c2db020 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPickActivity.java @@ -293,7 +293,7 @@ public class LiveWallpaperPickActivity extends Activity implements button.setOnClickListener(this); mConfigureButton = (Button)findViewById(R.id.configure); - mConfigureButton.setEnabled(false); + mConfigureButton.setVisibility(View.GONE); mConfigureButton.setOnClickListener(this); // Set default return data @@ -340,8 +340,11 @@ public class LiveWallpaperPickActivity extends Activity implements public void onItemSelected(AdapterView parent, View v, int position, long id) { mSelectedIntent = mWallpaperIntents.get(position); mSelectedInfo = mWallpaperInfos.get(position); - mConfigureButton.setEnabled(mSelectedInfo != null - && mSelectedInfo.getSettingsActivity() != null); + mConfigureButton.setVisibility( + (mSelectedInfo != null && + mSelectedInfo.getSettingsActivity() != null) + ? View.VISIBLE + : View.GONE); findViewById(R.id.set).setEnabled(true); WallpaperConnection conn = new WallpaperConnection(mSelectedIntent); @@ -359,6 +362,8 @@ public class LiveWallpaperPickActivity extends Activity implements try { mWallpaperManager.getIWallpaperManager().setWallpaperComponent( mSelectedIntent.getComponent()); + mWallpaperManager.setWallpaperOffsets( + v.getRootView().getWindowToken(), 0.5f, 0.0f); this.setResult(RESULT_OK); } catch (RemoteException e) { // do nothing |