Skip to content

Commit

Permalink
for sync.
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed Nov 29, 2012
1 parent 5693a7d commit a086d7a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
android:name=".activity.ComposeActivity" android:name=".activity.ComposeActivity"
android:label="@string/compose" android:label="@string/compose"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/Theme.Twidere.Light.DialogWhenLarge" android:theme="@style/Theme.Blank.DialogWhenLarge"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/compose"> <intent-filter android:label="@string/compose">
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
Expand Down Expand Up @@ -199,7 +199,7 @@
android:theme="@style/Theme.Twidere.Light.Dialog"/> android:theme="@style/Theme.Twidere.Light.Dialog"/>
<activity <activity
android:name=".activity.LinkHandlerActivity" android:name=".activity.LinkHandlerActivity"
android:theme="@style/Theme.Twidere.Light.DialogWhenLarge" android:theme="@style/Theme.Blank.DialogWhenLarge"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
Expand Down
4 changes: 3 additions & 1 deletion res/values-large-v11/themes.xml
Original file line number Original file line Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">


<style name="Theme.Blank.DialogWhenLarge" parent="Theme.Twidere.DialogWhenLarge"/>

<style name="Theme.Twidere.DialogWhenLarge" parent="Theme.Twidere.Dialog"> <style name="Theme.Twidere.DialogWhenLarge" parent="Theme.Twidere.Dialog">
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
Expand Down Expand Up @@ -31,4 +33,4 @@
<item name="menuBarBackground">@drawable/actionbar_bg_bottom_light_darkactionbar_holo</item> <item name="menuBarBackground">@drawable/actionbar_bg_bottom_light_darkactionbar_holo</item>
</style> </style>


</resources> </resources>
6 changes: 4 additions & 2 deletions res/values/themes.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">


<style name="Theme.Blank" parent="android:Theme.NoTitleBar"/> <style name="Theme.Blank" parent="android:Theme.NoTitleBar"/>


<style name="Theme.Blank.DialogWhenLarge" parent="android:Theme.NoTitleBar"/>

<style name="Theme.Twidere" parent="Theme.Holo"> <style name="Theme.Twidere" parent="Theme.Holo">
<item name="tabStyle">@style/Widget.TabPageIndicator</item> <item name="tabStyle">@style/Widget.TabPageIndicator</item>
<item name="tabTextStyle">@style/Widget.TabPageIndicator.TextView</item> <item name="tabTextStyle">@style/Widget.TabPageIndicator.TextView</item>
Expand Down Expand Up @@ -83,4 +85,4 @@


<style name="Theme.Twidere.Light.DialogWhenLarge"/> <style name="Theme.Twidere.Light.DialogWhenLarge"/>


</resources> </resources>

0 comments on commit a086d7a

Please sign in to comment.