Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
e
os
android_packages_apps_SetupWizard
Commits
3d6f3251
Commit
3d6f3251
authored
Jul 21, 2018
by
Unknown
Browse files
Merge branch 'DEV' into eelo-0.1
parents
62f81106
98462f5f
Changes
2
Hide whitespace changes
Inline
Side-by-side
res/values/colors.xml
View file @
3d6f3251
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
<!--
<!--
Copyright (C) 2013 The CyanogenMod Project
Copyright (C) 2013 The CyanogenMod Project
Copyright (C) 2017 The LineageOS Project
Copyright (C) 2017 The LineageOS Project
Copyright (C) 2018 /e/
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
...
@@ -21,8 +22,8 @@
...
@@ -21,8 +22,8 @@
<color
name=
"page_background"
>
#e4e7e9
</color>
<color
name=
"page_background"
>
#e4e7e9
</color>
<color
name=
"primary"
>
@color/page_background
</color>
<color
name=
"primary"
>
@color/page_background
</color>
<color
name=
"primary_dark"
>
#c2c5c7
</color>
<color
name=
"primary_dark"
>
@color/black
</color>
<color
name=
"accent"
>
#167C80
</color>
<color
name=
"accent"
>
@color/black
</color>
<color
name=
"primary_text"
>
#8a000000
</color>
<color
name=
"primary_text"
>
#8a000000
</color>
<color
name=
"secondary_text"
>
#42000000
</color>
<color
name=
"secondary_text"
>
#42000000
</color>
<color
name=
"button_bar_text_enabled"
>
#ff1e1e1e
</color>
<color
name=
"button_bar_text_enabled"
>
#ff1e1e1e
</color>
...
@@ -31,5 +32,5 @@
...
@@ -31,5 +32,5 @@
<color
name=
"header_bg"
>
@color/primary
</color>
<color
name=
"header_bg"
>
@color/primary
</color>
<color
name=
"header_condensed_bg"
>
@color/primary
</color>
<color
name=
"header_condensed_bg"
>
@color/primary
</color>
<color
name=
"button_bar_background"
>
@color/primary
</color>
<color
name=
"button_bar_background"
>
@color/primary
</color>
<color
name=
"fingerprint_setup_text_color"
>
#167C80
</color>
<color
name=
"fingerprint_setup_text_color"
>
@color/black
</color>
</resources>
</resources>
src/com/cyanogenmod/setupwizard/FinishActivity.java
View file @
3d6f3251
...
@@ -76,7 +76,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
...
@@ -76,7 +76,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
hasError
=
false
;
hasError
=
false
;
try
{
try
{
Intent
intent
=
new
Intent
(
"io.eelo.drive.LAUNCHER"
);
// TODO static
Intent
intent
=
new
Intent
(
"
xxx.
io.eelo.drive.LAUNCHER"
);
// TODO static
intent
.
putExtra
(
"EELO_SETTINGS_LAUNCHER"
,
"SETUP_WIZARD"
);
intent
.
putExtra
(
"EELO_SETTINGS_LAUNCHER"
,
"SETUP_WIZARD"
);
startActivityForResult
(
intent
,
EELO_SYNCHRONIZER_REQUEST_CODE
);
startActivityForResult
(
intent
,
EELO_SYNCHRONIZER_REQUEST_CODE
);
...
@@ -89,7 +89,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
...
@@ -89,7 +89,7 @@ public class FinishActivity extends BaseSetupWizardActivity {
mSetupWizardApp
=
(
SetupWizardApp
)
getApplication
();
mSetupWizardApp
=
(
SetupWizardApp
)
getApplication
();
mSetupWizardApp
.
getSettingsBundle
().
putBoolean
(
KEY_SEND_METRICS
,
false
);
// /e/ do *not* send metrics by default.
//
mSetupWizardApp.getSettingsBundle().putBoolean(KEY_SEND_METRICS, false); // /e/ do *not* send metrics by default.
mReveal
=
(
ImageView
)
findViewById
(
R
.
id
.
reveal
);
mReveal
=
(
ImageView
)
findViewById
(
R
.
id
.
reveal
);
mEnableAccessibilityController
=
mEnableAccessibilityController
=
...
...
Vincent Bourgmayer
🎼
@vincent
mentioned in commit
569624b5
·
Oct 30, 2018
mentioned in commit
569624b5
mentioned in commit 569624b584e7b9b468b80a7f06f47eec1e6dbb01
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment