8000 Merge branch 'develop' into feature/autocomplete · roychowdhuryrohit-dev/Android@0dad3c0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0dad3c0

Browse files
subsymbolicsubsymbolic
committed
Merge branch 'develop' into feature/autocomplete
# Conflicts: # app/src/main/res/layout/viewholder_bookmark.xml
2 parents 300dcc3 + cdd6af7 commit 0dad3c0

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

‎README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# DuckDuckGo Android
2+
3+
Welcome to our new android prototype. While it is still too early to accept contributions, we are excited to engage the community in development and will open up this project to contributions in the future.
4+
5+
If you are trying to contribute in other ways, that happens over at [DuckDuckHack](http://duckduckhack.com) or on [GitHub](http://github.com/duckduckgo).
6+
7+
## Discuss
8+
9+
Contact us at android@duckduckgo.com if you want to get more involved, have questions or want to chat.
10+
11+
## License
12+
DuckDuckGo android is distributed under the Apache 2.0 [license](https://github.com/duckduckgo/ios/blob/master/LICENSE).

‎app/src/main/res/layout/viewholder_bookmark.xml

Lines changed: 6 additions & 4 deletions
8000
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@
1919
android:layout_marginLeft="16dp"
2020
android:background="?attr/selectableItemBackgroundBorderless"
2121
android:contentDescription="@string/bookmark_content_description_delete_button"/>
22-
<FrameLayout
22+
<LinearLayout
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
25+
android:orientation="horizontal"
2526
android:layout_marginStart="16dp"
2627
android:layout_marginLeft="16dp"
2728
android:layout_marginEnd="16dp"
2829
android:layout_marginRight="16dp">
2930
<TextView
3031
android:id="@+id/bookmark_name_text_view"
31-
android:layout_width="match_parent"
32+
android:layout_width="0dp"
33+
android:layout_weight="1"
3234
android:layout_height="wrap_content"
3335
android:layout_gravity="center_vertical"/>
3436
<ImageView
@@ -40,5 +42,5 @@
4042
android:scaleType="center"
4143
android:src="@drawable/ic_reorder_black_24dp"
4244
android:contentDescription="@string/bookmark_content_description_drag_item"/>
43-
</FrameLayout>
44-
</LinearLayout>
45+
</LinearLayout>
46+
</LinearLayout>

0 commit comments

Comments
 (0)
0