TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2.3.x fragment LayoutParams issue.

Browse Source 
Closes #3167

// FREEBIE
This commit is contained in:
Jake McGinty 2015-05-14 14:57:47 -07:00 committed by Moxie Marlinspike
parent 729f63d6e5
commit c7d2ed4f7d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/conversation_activity.xml
View File

@ -123,8 +123,8 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<LinearLayout android:id="@+id/emoji_drawer" <FrameLayout android:id="@+id/emoji_drawer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -711,7 +711,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
EmojiDrawer emojiDrawerFragment = EmojiDrawer.newInstance(); EmojiDrawer emojiDrawerFragment = EmojiDrawer.newInstance();
emojiDrawerFragment.setComposeEditText(composeText); emojiDrawerFragment.setComposeEditText(composeText);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.replace(R.id.emoji_drawer, emojiDrawerFragment) .add(R.id.emoji_drawer, emojiDrawerFragment)
.commit(); .commit();
getSupportFragmentManager().executePendingTransactions(); getSupportFragmentManager().executePendingTransactions();
emojiDrawer = Optional.of(emojiDrawerFragment); emojiDrawer = Optional.of(emojiDrawerFragment);

3
src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
View File

@ -14,6 +14,7 @@ import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
@ -86,7 +87,7 @@ public class EmojiDrawer extends Fragment {
public void show() { public void show() {
int keyboardHeight = container.getKeyboardHeight(); int keyboardHeight = container.getKeyboardHeight();
Log.w("EmojiDrawer", "setting emoji drawer to height " + keyboardHeight); Log.w("EmojiDrawer", "setting emoji drawer to height " + keyboardHeight);
container.setLayoutParams(new LinearLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, keyboardHeight)); container.setLayoutParams(new FrameLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, keyboardHeight));
container.requestLayout(); container.requestLayout();
container.setVisibility(View.VISIBLE); container.setVisibility(View.VISIBLE);
} }