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

Merge "Convert EncryptionAndCredential into DashboardFragment"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-01 00:32:31 +00:00
committed by Android (Google) Code Review
parent ef7eb162cf 9679dba668
commit baaea544a5
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java → tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
View File

@@ -11,14 +11,14 @@
* 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
* limitations under the License.
*/
package com.android.settings;
package com.android.settings.security;
import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;
import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;
import static com.android.settings.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER;
import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@@ -28,6 +28,8 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;