diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-17 17:45:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-17 17:45:53 +0000 |
commit | c51787e954f518f98e43f16eaeffeeb1796019c6 (patch) | |
tree | e7ba5e5264a3f4be2968a97a08434383107db59e /src | |
parent | 17cea68d53ca81a184f317357f91ba8e71b51de2 (diff) | |
parent | d2ece574d224dc84c0fd4643af1f258df2121228 (diff) | |
download | ThemePicker-c51787e954f518f98e43f16eaeffeeb1796019c6.tar.gz |
Merge "Fix ThemePicker build and exclude unused features" into sc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/customization/picker/ViewOnlyFullPreviewActivity.java | 10 | ||||
-rw-r--r-- | src/com/android/customization/picker/clock/ClockFacePickerActivity.java (renamed from src/com/android/customization/picker/ClockFacePickerActivity.java) | 3 | ||||
-rw-r--r-- | src/com/android/customization/picker/theme/ThemeFragment.java | 1 | ||||
-rw-r--r-- | src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java | 1 | ||||
-rw-r--r-- | src/com/android/customization/picker/theme/ThemeInfoView.java (renamed from src/com/android/customization/widget/ThemeInfoView.java) | 2 |
5 files changed, 2 insertions, 15 deletions
diff --git a/src/com/android/customization/picker/ViewOnlyFullPreviewActivity.java b/src/com/android/customization/picker/ViewOnlyFullPreviewActivity.java index 91c310c2..44c6835b 100644 --- a/src/com/android/customization/picker/ViewOnlyFullPreviewActivity.java +++ b/src/com/android/customization/picker/ViewOnlyFullPreviewActivity.java @@ -15,8 +15,6 @@ */ package com.android.customization.picker; -import static com.android.customization.picker.theme.ThemeFullPreviewFragment.EXTRA_THEME_OPTION_TITLE; - import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -28,7 +26,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.android.customization.picker.grid.GridFullPreviewFragment; -import com.android.customization.picker.theme.ThemeFullPreviewFragment; import com.android.wallpaper.R; import com.android.wallpaper.picker.AppbarFragment.AppbarFragmentHost; import com.android.wallpaper.widget.BottomActionBar; @@ -81,13 +78,6 @@ public class ViewOnlyFullPreviewActivity extends FragmentActivity implements App if (section == SECTION_GRID) { showFragment(GridFullPreviewFragment.newInstance( getString(R.string.grid_title), bundle)); - } else if (section == SECTION_STYLE) { - final String themeTitle = bundle.getString(EXTRA_THEME_OPTION_TITLE); - showFragment(ThemeFullPreviewFragment.newInstance( - TextUtils.isEmpty(themeTitle) - ? getString(R.string.theme_title) - : themeTitle, - bundle)); } } diff --git a/src/com/android/customization/picker/ClockFacePickerActivity.java b/src/com/android/customization/picker/clock/ClockFacePickerActivity.java index 5065aef4..5e512341 100644 --- a/src/com/android/customization/picker/ClockFacePickerActivity.java +++ b/src/com/android/customization/picker/clock/ClockFacePickerActivity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.customization.picker; +package com.android.customization.picker.clock; import android.content.Intent; import android.os.Bundle; @@ -23,7 +23,6 @@ import androidx.fragment.app.FragmentTransaction; import com.android.customization.model.clock.BaseClockManager; import com.android.customization.model.clock.Clockface; import com.android.customization.model.clock.ContentProviderClockProvider; -import com.android.customization.picker.clock.ClockFragment; import com.android.customization.picker.clock.ClockFragment.ClockFragmentHost; import com.android.wallpaper.R; diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java index 5ff5ef82..965a2ad9 100644 --- a/src/com/android/customization/picker/theme/ThemeFragment.java +++ b/src/com/android/customization/picker/theme/ThemeFragment.java @@ -51,7 +51,6 @@ import com.android.customization.module.ThemesUserEventLogger; import com.android.customization.picker.ViewOnlyFullPreviewActivity; import com.android.customization.picker.WallpaperPreviewer; import com.android.customization.widget.OptionSelectorController; -import com.android.customization.widget.ThemeInfoView; import com.android.wallpaper.R; import com.android.wallpaper.model.WallpaperInfo; import com.android.wallpaper.module.CurrentWallpaperInfoFactory; diff --git a/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java b/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java index 77325e7c..5ea84ce8 100644 --- a/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java +++ b/src/com/android/customization/picker/theme/ThemeFullPreviewFragment.java @@ -37,7 +37,6 @@ import com.android.customization.model.theme.ThemeBundle; import com.android.customization.model.theme.ThemeBundleProvider; import com.android.customization.module.CustomizationInjector; import com.android.customization.picker.WallpaperPreviewer; -import com.android.customization.widget.ThemeInfoView; import com.android.wallpaper.R; import com.android.wallpaper.model.WallpaperInfo; import com.android.wallpaper.module.InjectorProvider; diff --git a/src/com/android/customization/widget/ThemeInfoView.java b/src/com/android/customization/picker/theme/ThemeInfoView.java index 9eb0320b..e929c4d2 100644 --- a/src/com/android/customization/widget/ThemeInfoView.java +++ b/src/com/android/customization/picker/theme/ThemeInfoView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.customization.widget; +package com.android.customization.picker.theme; import android.content.Context; import android.content.res.ColorStateList; |