Use microg-ui-tools
This commit is contained in:
parent
a775593901
commit
459b372d87
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +1,6 @@
|
||||||
[submodule "extern/UnifiedNlpApi"]
|
[submodule "extern/UnifiedNlpApi"]
|
||||||
path = extern/UnifiedNlpApi
|
path = extern/UnifiedNlpApi
|
||||||
url = https://github.com/microg/android_external_UnifiedNlpApi.git
|
url = https://github.com/microg/android_external_UnifiedNlpApi.git
|
||||||
|
[submodule "extern/MicroGUiTools"]
|
||||||
|
path = extern/MicroGUiTools
|
||||||
|
url = https://github.com/microg/android_external_MicroGUiTools.git
|
||||||
|
|
1
extern/MicroGUiTools
vendored
Submodule
1
extern/MicroGUiTools
vendored
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f34d87bcc2bb44de1a8efd29b40c311dbea67049
|
1
microg-ui-tools
Symbolic link
1
microg-ui-tools
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
extern/MicroGUiTools/microg-ui-tools/
|
|
@ -2,3 +2,5 @@ include ':unifiednlp-compat'
|
||||||
include ':unifiednlp-api'
|
include ':unifiednlp-api'
|
||||||
include ':unifiednlp-base'
|
include ':unifiednlp-base'
|
||||||
include ':unifiednlp-app'
|
include ':unifiednlp-app'
|
||||||
|
|
||||||
|
include ':microg-ui-tools'
|
||||||
|
|
|
@ -19,16 +19,29 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.3.0'
|
classpath 'com.android.tools.build:gradle:1.5.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
String getMyVersionName() {
|
||||||
|
def stdout = new ByteArrayOutputStream()
|
||||||
|
exec {
|
||||||
|
commandLine 'git', 'describe', '--tags', '--always', '--dirty'
|
||||||
|
standardOutput = stdout
|
||||||
|
}
|
||||||
|
return stdout.toString().trim()
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion "23.0.2"
|
buildToolsVersion "23.0.2"
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
versionName getMyVersionName()
|
||||||
|
}
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
NetworkLocation {
|
NetworkLocation {
|
||||||
applicationId = 'com.google.android.gms'
|
applicationId = 'com.google.android.gms'
|
||||||
|
|
|
@ -19,23 +19,36 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:1.3.0'
|
classpath 'com.android.tools.build:gradle:1.5.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
|
|
||||||
|
String getMyVersionName() {
|
||||||
|
def stdout = new ByteArrayOutputStream()
|
||||||
|
exec {
|
||||||
|
commandLine 'git', 'describe', '--tags', '--always', '--dirty'
|
||||||
|
standardOutput = stdout
|
||||||
|
}
|
||||||
|
return stdout.toString().trim()
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion "23.0.2"
|
buildToolsVersion "23.0.2"
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
versionName getMyVersionName()
|
||||||
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_6
|
sourceCompatibility JavaVersion.VERSION_1_6
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile 'com.android.support:support-v4:23.0.1'
|
compile project(":microg-ui-tools")
|
||||||
compile 'com.android.support:appcompat-v7:23.0.1'
|
|
||||||
compile project(':unifiednlp-api')
|
compile project(':unifiednlp-api')
|
||||||
provided project(':unifiednlp-compat')
|
provided project(':unifiednlp-compat')
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,297 +0,0 @@
|
||||||
package android.support.v4.preference;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Message;
|
|
||||||
import android.preference.Preference;
|
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
import android.preference.PreferenceScreen;
|
|
||||||
import android.support.v4.app.Fragment;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ListView;
|
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
|
|
||||||
public abstract class PreferenceFragment extends Fragment {
|
|
||||||
|
|
||||||
private static final int FIRST_REQUEST_CODE = 100;
|
|
||||||
private static final int MSG_BIND_PREFERENCES = 1;
|
|
||||||
private static final String PREFERENCES_TAG = "android:preferences";
|
|
||||||
private boolean mHavePrefs;
|
|
||||||
private boolean mInitDone;
|
|
||||||
private ListView mList;
|
|
||||||
private PreferenceManager mPreferenceManager;
|
|
||||||
|
|
||||||
private Handler mHandler = new Handler() {
|
|
||||||
@Override
|
|
||||||
public void handleMessage(Message msg) {
|
|
||||||
switch (msg.what) {
|
|
||||||
|
|
||||||
case MSG_BIND_PREFERENCES:
|
|
||||||
bindPreferences();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
final private Runnable mRequestFocus = new Runnable() {
|
|
||||||
public void run() {
|
|
||||||
mList.focusableViewAvailable(mList);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private void bindPreferences() {
|
|
||||||
PreferenceScreen localPreferenceScreen = getPreferenceScreen();
|
|
||||||
if (localPreferenceScreen != null) {
|
|
||||||
ListView localListView = getListView();
|
|
||||||
localPreferenceScreen.bind(localListView);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ensureList() {
|
|
||||||
if (mList == null) {
|
|
||||||
View view = getView();
|
|
||||||
if (view == null) {
|
|
||||||
throw new IllegalStateException("Content view not yet created");
|
|
||||||
}
|
|
||||||
|
|
||||||
View listView = view.findViewById(android.R.id.list);
|
|
||||||
if (!(listView instanceof ListView)) {
|
|
||||||
throw new RuntimeException(
|
|
||||||
"Content has view with id attribute 'android.R.id.list' that is not a ListView class");
|
|
||||||
}
|
|
||||||
|
|
||||||
mList = (ListView) listView;
|
|
||||||
if (mList == null) {
|
|
||||||
throw new RuntimeException(
|
|
||||||
"Your content must have a ListView whose id attribute is 'android.R.id.list'");
|
|
||||||
}
|
|
||||||
|
|
||||||
mHandler.post(mRequestFocus);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void postBindPreferences() {
|
|
||||||
if (mHandler.hasMessages(MSG_BIND_PREFERENCES)) {
|
|
||||||
mHandler.obtainMessage(MSG_BIND_PREFERENCES).sendToTarget();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void requirePreferenceManager() {
|
|
||||||
if (this.mPreferenceManager == null) {
|
|
||||||
throw new RuntimeException("This should be called after super.onCreate.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addPreferencesFromIntent(Intent intent) {
|
|
||||||
requirePreferenceManager();
|
|
||||||
PreferenceScreen screen = inflateFromIntent(intent, getPreferenceScreen());
|
|
||||||
setPreferenceScreen(screen);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addPreferencesFromResource(int resId) {
|
|
||||||
requirePreferenceManager();
|
|
||||||
PreferenceScreen screen = inflateFromResource(getActivity(), resId, getPreferenceScreen());
|
|
||||||
setPreferenceScreen(screen);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Preference findPreference(CharSequence key) {
|
|
||||||
if (mPreferenceManager == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return mPreferenceManager.findPreference(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ListView getListView() {
|
|
||||||
ensureList();
|
|
||||||
return mList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PreferenceManager getPreferenceManager() {
|
|
||||||
return mPreferenceManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityCreated(Bundle savedInstanceState) {
|
|
||||||
super.onActivityCreated(savedInstanceState);
|
|
||||||
getListView().setScrollBarStyle(0);
|
|
||||||
if (mHavePrefs) {
|
|
||||||
bindPreferences();
|
|
||||||
}
|
|
||||||
mInitDone = true;
|
|
||||||
if (savedInstanceState != null) {
|
|
||||||
Bundle localBundle = savedInstanceState.getBundle(PREFERENCES_TAG);
|
|
||||||
if (localBundle != null) {
|
|
||||||
PreferenceScreen screen = getPreferenceScreen();
|
|
||||||
if (screen != null) {
|
|
||||||
screen.restoreHierarchyState(localBundle);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
|
||||||
dispatchActivityResult(requestCode, resultCode, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle paramBundle) {
|
|
||||||
super.onCreate(paramBundle);
|
|
||||||
mPreferenceManager = createPreferenceManager();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public View onCreateView(LayoutInflater paramLayoutInflater, ViewGroup paramViewGroup,
|
|
||||||
Bundle paramBundle) {
|
|
||||||
ListView listView = new ListView(paramLayoutInflater.getContext());
|
|
||||||
listView.setId(android.R.id.list);
|
|
||||||
listView.setDrawSelectorOnTop(false);
|
|
||||||
listView.setPadding(12, 6, 12, 0);
|
|
||||||
//listView.setSelector(null);
|
|
||||||
return listView;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
dispatchActivityDestroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroyView() {
|
|
||||||
mList = null;
|
|
||||||
mHandler.removeCallbacks(mRequestFocus);
|
|
||||||
mHandler.removeMessages(MSG_BIND_PREFERENCES);
|
|
||||||
super.onDestroyView();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSaveInstanceState(Bundle bundle) {
|
|
||||||
super.onSaveInstanceState(bundle);
|
|
||||||
PreferenceScreen screen = getPreferenceScreen();
|
|
||||||
if (screen != null) {
|
|
||||||
Bundle localBundle = new Bundle();
|
|
||||||
screen.saveHierarchyState(localBundle);
|
|
||||||
bundle.putBundle(PREFERENCES_TAG, localBundle);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStop() {
|
|
||||||
super.onStop();
|
|
||||||
dispatchActivityStop();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Access methods with visibility private *
|
|
||||||
*/
|
|
||||||
|
|
||||||
private PreferenceManager createPreferenceManager() {
|
|
||||||
try {
|
|
||||||
Constructor<PreferenceManager> c = PreferenceManager.class
|
|
||||||
.getDeclaredConstructor(Activity.class, int.class);
|
|
||||||
c.setAccessible(true);
|
|
||||||
return c.newInstance(this.getActivity(), FIRST_REQUEST_CODE);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private PreferenceScreen getPreferenceScreen() {
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class.getDeclaredMethod("getPreferenceScreen");
|
|
||||||
m.setAccessible(true);
|
|
||||||
return (PreferenceScreen) m.invoke(mPreferenceManager);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setPreferenceScreen(PreferenceScreen preferenceScreen) {
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class
|
|
||||||
.getDeclaredMethod("setPreferences", PreferenceScreen.class);
|
|
||||||
m.setAccessible(true);
|
|
||||||
boolean result = (Boolean) m.invoke(mPreferenceManager, preferenceScreen);
|
|
||||||
if (result && preferenceScreen != null) {
|
|
||||||
mHavePrefs = true;
|
|
||||||
if (mInitDone) {
|
|
||||||
postBindPreferences();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void dispatchActivityResult(int requestCode, int resultCode, Intent data) {
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class
|
|
||||||
.getDeclaredMethod("dispatchActivityResult", int.class, int.class,
|
|
||||||
Intent.class);
|
|
||||||
m.setAccessible(true);
|
|
||||||
m.invoke(mPreferenceManager, requestCode, resultCode, data);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void dispatchActivityDestroy() {
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityDestroy");
|
|
||||||
m.setAccessible(true);
|
|
||||||
m.invoke(mPreferenceManager);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void dispatchActivityStop() {
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class.getDeclaredMethod("dispatchActivityStop");
|
|
||||||
m.setAccessible(true);
|
|
||||||
m.invoke(mPreferenceManager);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public PreferenceScreen inflateFromResource(Context context, int resId,
|
|
||||||
PreferenceScreen rootPreferences) {
|
|
||||||
PreferenceScreen preferenceScreen;
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class
|
|
||||||
.getDeclaredMethod("inflateFromResource", Context.class, int.class,
|
|
||||||
PreferenceScreen.class);
|
|
||||||
m.setAccessible(true);
|
|
||||||
preferenceScreen = (PreferenceScreen) m
|
|
||||||
.invoke(mPreferenceManager, context, resId, rootPreferences);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
return preferenceScreen;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PreferenceScreen inflateFromIntent(Intent queryIntent,
|
|
||||||
PreferenceScreen rootPreferences) {
|
|
||||||
PreferenceScreen preferenceScreen;
|
|
||||||
try {
|
|
||||||
Method m = PreferenceManager.class
|
|
||||||
.getDeclaredMethod("inflateFromIntent", Intent.class, PreferenceScreen.class);
|
|
||||||
m.setAccessible(true);
|
|
||||||
preferenceScreen = (PreferenceScreen) m
|
|
||||||
.invoke(mPreferenceManager, queryIntent, rootPreferences);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
return preferenceScreen;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,60 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2013-2015 microG Project Team
|
|
||||||
*
|
|
||||||
* 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 org.microg.tools.selfcheck;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
|
||||||
import android.support.v7.widget.Toolbar;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.View;
|
|
||||||
import android.view.ViewGroup;
|
|
||||||
import android.widget.ImageView;
|
|
||||||
import android.widget.TextView;
|
|
||||||
|
|
||||||
import org.microg.nlp.R;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public abstract class AbstractSelfCheckActivity extends AppCompatActivity implements SelfCheckGroup.ResultCollector {
|
|
||||||
|
|
||||||
protected abstract void prepareSelfCheckList(List<SelfCheckGroup> checks);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
setContentView(R.layout.self_check);
|
|
||||||
setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
|
|
||||||
|
|
||||||
List<SelfCheckGroup> selfCheckGroupList = new ArrayList<SelfCheckGroup>();
|
|
||||||
prepareSelfCheckList(selfCheckGroupList);
|
|
||||||
|
|
||||||
for (SelfCheckGroup group : selfCheckGroupList) {
|
|
||||||
group.doChecks(this, this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addResult(String name, boolean result, String resolution) {
|
|
||||||
ViewGroup root = (ViewGroup) findViewById(R.id.self_check_root);
|
|
||||||
View resultEntry = LayoutInflater.from(this).inflate(R.layout.self_check_entry, root, false);
|
|
||||||
((TextView) resultEntry.findViewById(R.id.self_check_name)).setText(name);
|
|
||||||
((ImageView) resultEntry.findViewById(R.id.self_check_result)).setImageResource(result ? android.R.drawable.presence_online : android.R.drawable.presence_busy);
|
|
||||||
((TextView) resultEntry.findViewById(R.id.self_check_resolution)).setText(resolution);
|
|
||||||
resultEntry.findViewById(R.id.self_check_resolution).setVisibility(result ? View.GONE : View.VISIBLE);
|
|
||||||
root.addView(resultEntry);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,29 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 2013-2015 microG Project Team
|
|
||||||
*
|
|
||||||
* 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 org.microg.tools.selfcheck;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
|
|
||||||
public interface SelfCheckGroup {
|
|
||||||
String getGroupName(Context context);
|
|
||||||
|
|
||||||
void doChecks(Context context, ResultCollector collector);
|
|
||||||
|
|
||||||
interface ResultCollector {
|
|
||||||
void addResult(String name, boolean value, String resolution);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,37 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
~ Copyright 2013-2015 microG Project Team
|
|
||||||
~
|
|
||||||
~ 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<include layout="@layout/toolbar"/>
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/self_check_root"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
|
||||||
</LinearLayout>
|
|
|
@ -1,46 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
~ Copyright 2013-2015 microG Project Team
|
|
||||||
~
|
|
||||||
~ 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="10dp">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/self_check_name"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="This is the title of a check: "
|
|
||||||
android:textStyle="bold"/>
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/self_check_result"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignBottom="@id/self_check_name"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignRight="@id/self_check_name"
|
|
||||||
android:src="@android:drawable/presence_busy"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/self_check_resolution"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/self_check_name"
|
|
||||||
android:layout_toLeftOf="@id/self_check_result"
|
|
||||||
android:text="This is a way to solve the issue that check above failed. It can consist of multiple lines."/>
|
|
||||||
</RelativeLayout>
|
|
|
@ -1,24 +0,0 @@
|
||||||
<!--
|
|
||||||
~ Copyright 2013-2015 microG Project Team
|
|
||||||
~
|
|
||||||
~ 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
android:id="@+id/toolbar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="?attr/colorPrimary"
|
|
||||||
android:minHeight="?attr/actionBarSize"
|
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
|
|
|
@ -1,21 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
~ Copyright 2013-2015 microG Project Team
|
|
||||||
~
|
|
||||||
~ 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<resources>
|
|
||||||
<color name="nlp_theme_primary">#ff263238</color>
|
|
||||||
<color name="nlp_theme_primary_dark">#ff21272b</color>
|
|
||||||
<color name="nlp_theme_accent">#ff009688</color>
|
|
||||||
</resources>
|
|
|
@ -1,26 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
~ Copyright 2013-2015 microG Project Team
|
|
||||||
~
|
|
||||||
~ 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.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
|
|
||||||
<style name="SettingsTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
|
||||||
<item name="colorPrimary">@color/nlp_theme_primary</item>
|
|
||||||
<item name="colorPrimaryDark">@color/nlp_theme_primary_dark</item>
|
|
||||||
<item name="android:colorPrimary" tools:targetApi="21">@color/nlp_theme_primary</item>
|
|
||||||
<item name="android:colorPrimaryDark" tools:targetApi="21">@color/nlp_theme_primary_dark</item>
|
|
||||||
<item name="android:colorAccent" tools:targetApi="21">@color/nlp_theme_accent</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
Loading…
Reference in a new issue