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

TV Support Scan Devices And Sync Keep and History #460

Open
wants to merge 14 commits into
base: release
Choose a base branch
from
Open

TV Support Scan Devices And Sync Keep and History #460

Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a739f3
TV Support Scan Devices And Sync Keep and History
jadehh May 29, 2024
1e53d2b
Merge branch 'release' into 2-多设备同步收藏和播放历史
jadehh May 29, 2024
467f683
Merge pull request #14 from jadehh/2-多设备同步收藏和播放历史
jadehh May 29, 2024
1a24fca
Merge branch 'FongMi:release' into release
jadehh Jun 4, 2024
aa0b427
Merge branch 'FongMi:release' into release
jadehh Jun 5, 2024
4febbf0
* 调整同步收藏布局，解决同步收藏无焦点的bug
jadehh Jun 6, 2024
b6e578d
Merge branch 'FongMi:release' into 2-多设备同步收藏和播放历史
jadehh Jun 6, 2024
590b491
Merge branch 'release' into 2-多设备同步收藏和播放历史
jadehh Jun 6, 2024
5b04180
Merge pull request #19 from jadehh/2-多设备同步收藏和播放历史
jadehh Jun 6, 2024
74c96ec
* Fix Conflict
jadehh Jun 6, 2024
0a350f9
Fix Conflict
jadehh Jun 6, 2024
5cb2e63
Merge remote-tracking branch 'origin/release' into release
jadehh Jun 6, 2024
bdcb561
* fix about UI
jadehh Jun 6, 2024
eeef4ca
Merge pull request #21 from jadehh/release
jadehh Jun 6, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions app/src/leanback/res/layout/activity_setting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,6 @@
android:id="@+id/version"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
Expand Down Expand Up @@ -526,54 +525,6 @@

</LinearLayout>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">

<LinearLayout
android:id="@+id/sync_keep"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_keep_sync"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>

<LinearLayout
android:id="@+id/sync_history"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_history_sync"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down