Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcdba421 authored by Catherine Liang's avatar Catherine Liang
Browse files

Pre-revamped UI cleanup grid file rename & move (1/2) 

As part of the revamped UI flag removal process, rename files to replace
original. Also move files placed under model folder into picker folder
to be more uniform with existing revamped UI file organization.

Bug: 262780002
Test: manually verified functionalities still work throughout the
wallpaper picker app

Change-Id: I145edf632f8716169ba14fd0c83314f4dc305c5b
parent a4264fef

res/layout/grid_section_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.customization.picker.grid.GridSectionView

<com.android.customization.picker.grid.ui.view.GridSectionView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -53,4 +53,4 @@ 
        android:background="@drawable/picker_section_icon_background"

        android:contentDescription="@string/gird_picker_entry_content_description" />



</com.android.customization.picker.grid.GridSectionView>
 
 No newline at end of file
 
</com.android.customization.picker.grid.ui.view.GridSectionView>
 
 No newline at end of file

src/com/android/customization/module/DefaultCustomizationSections.java

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import androidx.lifecycle.LifecycleOwner; 
import androidx.lifecycle.ViewModelProvider;



import com.android.customization.model.grid.GridOptionsManager;

import com.android.customization.model.grid.GridSectionController;

import com.android.customization.model.mode.DarkModeSnapshotRestorer;

import com.android.customization.model.themedicon.ThemedIconSectionController;

import com.android.customization.model.themedicon.ThemedIconSwitchProvider;
@@ -20,6 +19,7 @@ import com.android.customization.picker.clock.ui.viewmodel.ClockCarouselViewMode 
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor;

import com.android.customization.picker.color.ui.section.ColorSectionController2;

import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel;

import com.android.customization.picker.grid.ui.section.GridSectionController;

import com.android.customization.picker.notifications.ui.section.NotificationSectionController;

import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel;

import com.android.customization.picker.preview.ui.section.PreviewWithClockCarouselSectionController;

src/com/android/customization/module/ThemePickerInjector.kt

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ import com.android.customization.model.color.ColorCustomizationManager 
import com.android.customization.model.color.ColorOptionsProvider

import com.android.customization.model.color.ColorOptionsProvider.COLOR_SOURCE_PRESET

import com.android.customization.model.grid.GridOptionsManager

import com.android.customization.model.grid.data.repository.GridRepositoryImpl

import com.android.customization.model.grid.domain.interactor.GridInteractor

import com.android.customization.model.grid.domain.interactor.GridSnapshotRestorer

import com.android.customization.model.grid.ui.viewmodel.GridScreenViewModel

import com.android.customization.model.mode.DarkModeSnapshotRestorer

import com.android.customization.model.theme.OverlayManagerCompat

import com.android.customization.model.theme.ThemeBundleProvider
@@ -59,6 +55,10 @@ import com.android.customization.picker.color.data.repository.ColorPickerReposit 
import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor

import com.android.customization.picker.color.domain.interactor.ColorPickerSnapshotRestorer

import com.android.customization.picker.color.ui.viewmodel.ColorPickerViewModel

import com.android.customization.picker.grid.data.repository.GridRepositoryImpl

import com.android.customization.picker.grid.domain.interactor.GridInteractor

import com.android.customization.picker.grid.domain.interactor.GridSnapshotRestorer

import com.android.customization.picker.grid.ui.viewmodel.GridScreenViewModel

import com.android.customization.picker.notifications.data.repository.NotificationsRepository

import com.android.customization.picker.notifications.domain.interactor.NotificationsInteractor

import com.android.customization.picker.notifications.domain.interactor.NotificationsSnapshotRestorer

src/com/android/customization/model/grid/data/repository/GridRepository.kt→src/com/android/customization/picker/grid/data/repository/GridRepository.kt

+3 −3
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
 *

 */



package com.android.customization.model.grid.data.repository

package com.android.customization.picker.grid.data.repository



import androidx.lifecycle.asFlow

import com.android.customization.model.CustomizationManager

import com.android.customization.model.CustomizationManager.Callback

import com.android.customization.model.grid.GridOption

import com.android.customization.model.grid.GridOptionsManager

import com.android.customization.model.grid.shared.model.GridOptionItemModel

import com.android.customization.model.grid.shared.model.GridOptionItemsModel

import com.android.customization.picker.grid.shared.model.GridOptionItemModel

import com.android.customization.picker.grid.shared.model.GridOptionItemsModel

import kotlin.coroutines.resume

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

src/com/android/customization/model/grid/domain/interactor/GridInteractor.kt→src/com/android/customization/picker/grid/domain/interactor/GridInteractor.kt

+4 −4
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
 *

 */



package com.android.customization.model.grid.domain.interactor

package com.android.customization.picker.grid.domain.interactor



import com.android.customization.model.CustomizationManager

import com.android.customization.model.grid.GridOption

import com.android.customization.model.grid.data.repository.GridRepository

import com.android.customization.model.grid.shared.model.GridOptionItemModel

import com.android.customization.model.grid.shared.model.GridOptionItemsModel

import com.android.customization.picker.grid.data.repository.GridRepository

import com.android.customization.picker.grid.shared.model.GridOptionItemModel

import com.android.customization.picker.grid.shared.model.GridOptionItemsModel

import javax.inject.Provider

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.Flow