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

Move UsageGraph from SettingsLib to Settings.

Browse Source 
In preparation for modifying the graph code to show detailed projections
(see bug), this change moves it into Settings along with related tests
and resources.

Bug: 38400320
Test: manual, make SettingsUnitTests, make SettingsGoogleUnitTests
Change-Id: I88e5336c15827727b3427e29b10954bba9cfba7d
This commit is contained in:
Alex Kulesza
2017-06-02 18:16:28 -04:00
parent fe23da579d
commit c661098ab8
16 changed files with 741 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
View File

@@ -30,7 +30,7 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settingslib.graph.UsageView;
import com.android.settings.graph.UsageView;
import org.junit.Before;
import org.junit.Test;

70
tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java Normal file
View File

@@ -0,0 +1,70 @@
/*
* Copyright (C) 2017 The Android Open Source Project
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* 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.graph;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.Space;
import com.android.settings.R;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BottomLabelLayoutTest {
private BottomLabelLayout mBottomLabelLayout;
private Context mContext;
private Space mSpace;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mBottomLabelLayout = new BottomLabelLayout(mContext, null);
mBottomLabelLayout.setOrientation(LinearLayout.HORIZONTAL);
mSpace = new Space(mContext);
mSpace.setId(R.id.spacer);
mBottomLabelLayout.addView(mSpace);
}
@Test
public void testSetStacked_stackedTrue_layoutVertical() {
mBottomLabelLayout.setStacked(true);
assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.VERTICAL);
assertThat(mSpace.getVisibility()).isEqualTo(View.GONE);
}
@Test
public void testSetStacked_stackedFalse_layoutHorizontal() {
mBottomLabelLayout.setStacked(false);
assertThat(mBottomLabelLayout.getOrientation()).isEqualTo(LinearLayout.HORIZONTAL);
assertThat(mSpace.getVisibility()).isEqualTo(View.VISIBLE);
}
}