Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-19377] Android: Preferences Activity fix with action bar on Lo… #7045

Closed
wants to merge 3 commits into from
Closed

[TIMOB-19377] Android: Preferences Activity fix with action bar on Lo… #7045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bed1a2
[TIMOB-19377] Android: Preferences Activity fix with action bar on Lo…
Aug 19, 2015
8ee7bf5
[TIMOB-19377] Added v14 styles for Preference Activity
Aug 24, 2015
cc286ac
[TIMOB-19377] Updated v14 styles to match Material
Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 21 additions & 0 deletions android/modules/ui/res/values-v14/styles.xml
View file
Open in desktop
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.TiPreferences" parent="@android:style/Theme.Holo">
<item name="android:actionBarStyle">@style/ActionBar.V14.TiPreferences</item>
</style>

<!-- Activity action bar styles -->
<style name="ActionBar.V14.TiPreferences" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
<!-- For Material Theme, primary_dark_material_dark is #ff000000-->
<item name="android:background">#ff000000</item>
<item name="android:height">56dp</item>
<item name="android:titleTextStyle">@style/ActionBar.V14.TiPreferences.TitleTextStyle</item>
<item name="android:logo">@android:color/transparent</item>
</style>

<style name="ActionBar.V14.TiPreferences.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title" >
<item name="android:textColor">@android:color/white</item>
</style>

</resources>
6 changes: 6 additions & 0 deletions android/modules/ui/res/values-v21/styles.xml
View file
Open in desktop
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.TiPreferences" parent="@android:style/Theme.Material" />

</resources>
6 changes: 6 additions & 0 deletions android/modules/ui/res/values/styles.xml
View file
Open in desktop
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.TiPreferences" parent="Theme.AppCompat" />

</resources>
3 changes: 2 additions & 1 deletion android/templates/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,8 @@
<activity android:name="org.appcelerator.titanium.TiTranslucentActivity"
android:configChanges="keyboardHidden|orientation"
android:theme="@android:style/Theme.Translucent" />
<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" />
<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"
android:theme="@style/Theme.TiPreferences" />

<service android:name="org.appcelerator.titanium.analytics.TiAnalyticsService"
android:exported="false" />
Expand Down
3 changes: 2 additions & 1 deletion android/templates/build/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -30,7 +30,8 @@
<activity android:name="org.appcelerator.titanium.TiTranslucentActivity"
android:configChanges="keyboardHidden|orientation"
android:theme="@style/Theme.AppCompat.Translucent" />
<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" />
<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"
android:theme="@style/Theme.TiPreferences" />

</application>

Expand Down