PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move all contextual card related classes.

Browse Source 
... from homepage to contextualcards.

Test: rebuild
Change-Id: Id7889566ce1e7257eb699d963ae996906fdb58ff
This commit is contained in:
Fan Zhang
2018-10-25 14:19:43 -07:00
parent 798dd76ca5
commit 5e6e6a14f2
83 changed files with 181 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
View File

@@ -12,10 +12,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.android.settings.homepage;
package com.android.settings.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;

3
tests/robotests/src/com/android/settings/homepage/CardDatabaseHelperTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
View File

@@ -12,10 +12,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.android.settings.homepage;
package com.android.settings.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;

4
tests/robotests/src/com/android/settings/homepage/ConditionalContextualCardTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.android.settings.homepage;
package com.android.settings.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.homepage.conditional.ConditionalContextualCard;
import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;

25
tests/robotests/src/com/android/settings/homepage/CardContentLoaderTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
View File

@@ -14,17 +14,16 @@
* limitations under the License.
*/
package com.android.settings.homepage;
package com.android.settings.homepage.contextualcards;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.net.Uri;
import com.android.settings.homepage.deviceinfo.BatterySlice;
import com.android.settings.homepage.deviceinfo.DataUsageSlice;
import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
import com.android.settings.homepage.deviceinfo.StorageSlice;
import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,16 +38,16 @@ import java.util.List;
import java.util.stream.Collectors;
@RunWith(SettingsRobolectricTestRunner.class)
public class CardContentLoaderTest {
public class ContextualCardLoaderTest {
private Context mContext;
private CardContentLoader mCardContentLoader;
private ContextualCardLoader mContextualCardLoader;
private SettingsSliceProvider mProvider;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mCardContentLoader = new CardContentLoader(mContext);
mContextualCardLoader = new ContextualCardLoader(mContext);
mProvider = new SettingsSliceProvider();
ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
mProvider);
@@ -56,7 +55,7 @@ public class CardContentLoaderTest {
@Test
public void createStaticCards_shouldReturnFourCards() {
final List<ContextualCard> defaultData = mCardContentLoader.createStaticCards();
final List<ContextualCard> defaultData = mContextualCardLoader.createStaticCards();
assertThat(defaultData).hasSize(3);
}
@@ -68,7 +67,7 @@ public class CardContentLoaderTest {
final Uri batteryInfo = BatterySlice.BATTERY_CARD_URI;
final List<Uri> expectedUris = Arrays.asList(dataUsage, deviceInfo, batteryInfo);
final List<Uri> actualCardUris = mCardContentLoader.createStaticCards().stream().map(
final List<Uri> actualCardUris = mContextualCardLoader.createStaticCards().stream().map(
ContextualCard::getSliceUri).collect(Collectors.toList());
assertThat(actualCardUris).containsExactlyElementsIn(expectedUris);
@@ -83,7 +82,7 @@ public class CardContentLoaderTest {
.setSummaryText("custom_summary")
.build();
assertThat(mCardContentLoader.isCardEligibleToDisplay(customCard)).isTrue();
assertThat(mContextualCardLoader.isCardEligibleToDisplay(customCard)).isTrue();
}
@Test
@@ -91,7 +90,7 @@ public class CardContentLoaderTest {
final String sliceUri = "contet://com.android.settings.slices/action/flashlight";
assertThat(
mCardContentLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
}
@Test
@@ -99,7 +98,7 @@ public class CardContentLoaderTest {
final String sliceUri = "content://com.android.settings.test.slices/action/flashlight";
assertThat(
mCardContentLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
mContextualCardLoader.isCardEligibleToDisplay(getContextualCard(sliceUri))).isFalse();
}
private ContextualCard getContextualCard(String sliceUri) {

2
tests/robotests/src/com/android/settings/homepage/conditional/AbnormalRingerConditionControllerBaseTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/homepage/conditional/BackgroundDataConditionControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/conditional/BatterySaverConditionControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;

4
tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
@@ -26,7 +26,7 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import com.android.settings.R;
import com.android.settings.homepage.ContextualCardUpdateListener;
import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;

6
tests/robotests/src/com/android/settings/homepage/conditional/ConditionContextualCardRendererTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;
@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.ControllerRendererPool;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ControllerRendererPool;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;

2
tests/robotests/src/com/android/settings/homepage/conditional/ConditionManagerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static org.mockito.ArgumentMatchers.any;

2
tests/robotests/src/com/android/settings/homepage/conditional/DndConditionalCardTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/conditional/NightDisplayConditionControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static org.mockito.Mockito.verify;

2
tests/robotests/src/com/android/settings/homepage/conditional/RingerVibrateConditionCardTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCardTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/conditional/WorkModeConditionControllerTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.conditional;
package com.android.settings.homepage.contextualcards.conditional;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy;

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/BatterySliceTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.deviceinfo;
package com.android.settings.homepage.contextualcards.deviceinfo;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.deviceinfo;
package com.android.settings.homepage.contextualcards.deviceinfo;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/DeviceInfoSliceTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.deviceinfo;
package com.android.settings.homepage.contextualcards.deviceinfo;
import static com.google.common.truth.Truth.assertThat;

2
tests/robotests/src/com/android/settings/homepage/deviceinfo/StorageSliceTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.deviceinfo;
package com.android.settings.homepage.contextualcards.deviceinfo;
import static com.google.common.truth.Truth.assertThat;

8
tests/robotests/src/com/android/settings/homepage/slices/SliceContextualCardRendererTest.java → tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.homepage.slices;
package com.android.settings.homepage.contextualcards.slices;
import static com.google.common.truth.Truth.assertThat;
@@ -31,8 +31,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.slice.Slice;
import com.android.settings.homepage.ContextualCard;
import com.android.settings.homepage.PersonalSettingsFragment;
import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -56,7 +56,7 @@ public class SliceContextualCardRendererTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mLifecycleOwner = new PersonalSettingsFragment();
mLifecycleOwner = new ContextualCardsFragment();
mRenderer = new SliceContextualCardRenderer(mContext, mLifecycleOwner);
}