From 35adb26e56973506eab6b0140da573072ca06a34 Mon Sep 17 00:00:00 2001 From: Adnan Date: Mon, 4 Aug 2014 14:16:32 -0700 Subject: Trebuchet: Don't show protected apps options in restricted profiles. Change-Id: I6fb32d39e25150fdc65669c452784ab60e9f3115 JIRA: 4668 Issue: https://jira.cyanogenmod.org/browse/CYAN-4668 --- src/com/android/launcher3/OverviewSettingsPanel.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/OverviewSettingsPanel.java') diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index e14b78942..497e7cac1 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -11,6 +11,9 @@ import android.widget.ListView; import com.android.launcher3.list.PinnedHeaderListView; import com.android.launcher3.list.SettingsPinnedHeaderAdapter; +import java.util.ArrayList; +import java.util.List; + public class OverviewSettingsPanel { public static final String ANDROID_SETTINGS = "com.android.settings"; public static final String ANDROID_PROTECTED_APPS = @@ -56,10 +59,14 @@ public class OverviewSettingsPanel { res.getString(R.string.drawer_sorting_text), res.getString(R.string.icon_labels)}; - String[] valuesApp = new String[] { - res.getString(R.string.larger_icons_text), - res.getString(R.string.protected_app_settings)}; + List valuesAppList = new ArrayList(); + valuesAppList.add(res.getString(R.string.larger_icons_text)); + if (!Utilities.isRestrictedProfile(mLauncher)) { + valuesAppList.add(res.getString(R.string.protected_app_settings)); + } + String[] valuesApp = new String[valuesAppList.size()]; + valuesApp = valuesAppList.toArray(valuesApp); mSettingsAdapter = new SettingsPinnedHeaderAdapter(mLauncher); mSettingsAdapter.setHeaders(headers); -- cgit v1.2.3 From 562b36032fa60424ca974c0985046f5587f2e8e4 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Tue, 12 Aug 2014 18:01:13 -0700 Subject: Settings adapter should use the position and partition values Fixes: https://jira.cyanogenmod.org/browse/BACON-587 Change-Id: Ie935c51ea1e68eaa7da64b23eaf2ae28a630a3bb --- src/com/android/launcher3/OverviewSettingsPanel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/OverviewSettingsPanel.java') diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index 497e7cac1..4381b91c4 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -22,6 +22,7 @@ public class OverviewSettingsPanel { "com.android.settings.Settings$ThemeSettingsActivity"; public static final int HOME_SETTINGS_POSITION = 0; public static final int DRAWER_SETTINGS_POSITION = 1; + public static final int APP_SETTINGS_POSITION = 2; private Launcher mLauncher; private View mOverviewPanel; @@ -75,9 +76,10 @@ public class OverviewSettingsPanel { mSettingsAdapter.addPartition(false, true); mSettingsAdapter.mPinnedHeaderCount = headers.length; - mSettingsAdapter.changeCursor(0, createCursor(headers[0], mValues)); - mSettingsAdapter.changeCursor(1, createCursor(headers[1], valuesDrawer)); - mSettingsAdapter.changeCursor(2, createCursor(headers[2], valuesApp)); + mSettingsAdapter.changeCursor(HOME_SETTINGS_POSITION, createCursor(headers[0], mValues)); + mSettingsAdapter.changeCursor(DRAWER_SETTINGS_POSITION, createCursor(headers[1], + valuesDrawer)); + mSettingsAdapter.changeCursor(APP_SETTINGS_POSITION, createCursor(headers[2], valuesApp)); mListView.setAdapter(mSettingsAdapter); } -- cgit v1.2.3 From fa3f1597d55347db92d4c3ced74e62db3a6d6d84 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Mon, 11 Aug 2014 17:30:48 -0700 Subject: Fix for workspace showing outline after live settings changes Change-Id: Ia60d8541b91e0ea9f65c8551aff1cfea7ae5c3fa --- src/com/android/launcher3/OverviewSettingsPanel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher3/OverviewSettingsPanel.java') diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index 4381b91c4..f0a568b74 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -217,8 +217,10 @@ public class OverviewSettingsPanel { frameAnimation.start(); if (mLauncher.updateGridIfNeeded()) { - mLauncher.getWorkspace().showOutlines(); - mLauncher.mSearchDropTargetBar.hideSearchBar(false); + if (mLauncher.getWorkspace().isInOverviewMode()) { + mLauncher.getWorkspace().showOutlines(); + mLauncher.mSearchDropTargetBar.hideSearchBar(false); + } } } -- cgit v1.2.3