diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-17 15:23:41 -0700 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-23 21:23:33 +0000 |
commit | a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6 (patch) | |
tree | 1e184c8e4744680320e0f236b593b09259b29fb6 /src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | |
parent | 94ba73919c6219be8054696b1a23ef0d97bc64fb (diff) | |
download | android_packages_apps_Trebuchet-a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6.tar.gz android_packages_apps_Trebuchet-a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6.tar.bz2 android_packages_apps_Trebuchet-a5ee6730d45a4c5f6ccbce4d6332881f5f15d9b6.zip |
Customizeable Dynamic Grid:
- Presets
- Comfortable (+0)
- Cozy (+1)
- Condensed (+2)
- Custom option with min, max
Reordering items in the settings pane for better organization
Modifying Settings Layout for readability
Change-Id: I5c926b6ca4b2ed73c263ef34eeb368caeb7af9b5
Diffstat (limited to 'src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java')
-rw-r--r-- | src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index a7c293152..dd1dc3b0a 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -11,6 +11,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.OverviewSettingsPanel; import com.android.launcher3.AppsCustomizePagedView; @@ -142,6 +143,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { R.string.setting_state_on) : res.getString( R.string.setting_state_off); ((TextView) v.findViewById(R.id.item_state)).setText(state); + } else if (title.equals(res.getString(R.string.grid_size_text))) { + updateDynamicGridSizeSettingsItem(v); } else { ((TextView) v.findViewById(R.id.item_state)).setText(""); } @@ -183,6 +186,34 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { ((TextView) v.findViewById(R.id.item_state)).setText(state); } + public void updateDynamicGridSizeSettingsItem(View v) { + DeviceProfile.GridSize gridSize = DeviceProfile.GridSize.getModeForValue( + SettingsProvider.getIntCustomDefault(mLauncher, + SettingsProvider.SETTINGS_UI_DYNAMIC_GRID_SIZE, 0)); + String state = ""; + + switch (gridSize) { + case Comfortable: + state = mLauncher.getResources().getString(R.string.grid_size_comfortable); + break; + case Cozy: + state = mLauncher.getResources().getString(R.string.grid_size_cozy); + break; + case Condensed: + state = mLauncher.getResources().getString(R.string.grid_size_condensed); + break; + case Custom: + state = mLauncher.getResources().getString(R.string.grid_size_custom); + int rows = SettingsProvider.getIntCustomDefault(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, 0); + int columns = SettingsProvider.getIntCustomDefault(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, 0); + state += "(" + rows + "x" + columns + ")"; + break; + } + ((TextView) v.findViewById(R.id.item_state)).setText(state); + } + private String mapEffectToValue(String effect) { final String[] titles = mLauncher.getResources().getStringArray( R.array.transition_effect_entries); @@ -253,6 +284,8 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { intent.setClassName(OverviewSettingsPanel.ANDROID_SETTINGS, OverviewSettingsPanel.ANDROID_PROTECTED_APPS); mLauncher.startActivity(intent); + } else if (value.equals(res.getString(R.string.protected_app_settings))) { + } else if (value.equals(res .getString(R.string.scrolling_wallpaper))) { onSettingsBooleanChanged( @@ -280,6 +313,9 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { R.bool.preferences_interface_homescreen_search_screen_left_default); mLauncher.updateDynamicGrid(); } + } else if (value.equals(res + .getString(R.string.grid_size_text))) { + mLauncher.onClickDynamicGridSizeButton(); } View defaultHome = mLauncher.findViewById(R.id.default_home_screen_panel); |