positions 分支恢复到15.0.16版本,提交点6376ff4ccfa5955ae7d6a109a8a758c904a73b67
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
@@ -65,16 +65,6 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<cc.winboll.studio.positions.views.HourglassView
|
||||
android:id="@+id/hourglassView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
@@ -87,7 +77,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="开始时间"
|
||||
android:id="@+id/btn_select_time"/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_selected_time"
|
||||
android:layout_width="0dp"
|
||||
@@ -95,6 +85,7 @@
|
||||
android:text="Text"
|
||||
android:layout_weight="1.0"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">悟空笔记</string>
|
||||
<string name="appplus_name">时空任务</string>
|
||||
<string name="open_appplus">开疆扩土</string>
|
||||
<string name="close_appplus">返璞归真</string>
|
||||
<string name="appplus_open_disabled">余力不足</string>
|
||||
<string name="appplus_close_disabled">辎重难返</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
<resources>
|
||||
<string name="app_name">Positions</string>
|
||||
<string name="appplus_name">PositionsPlus</string>
|
||||
<string name="open_appplus">Open APP Plus</string>
|
||||
<string name="close_appplus">Close APP Plus</string>
|
||||
<string name="appplus_open_disabled">APP Plus Open Disable</string>
|
||||
<string name="appplus_close_disabled">APP Plus Close Disable</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<external-files-path
|
||||
name="BaseBean"
|
||||
path="BaseBean/" />
|
||||
</paths>
|
||||
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- 切换启动入口的快捷菜单 -->
|
||||
<shortcut
|
||||
android:shortcutId="open_appplus"
|
||||
android:enabled="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:shortcutShortLabel="@string/open_appplus"
|
||||
android:shortcutLongLabel="@string/open_appplus"
|
||||
android:shortcutDisabledMessage="@string/appplus_open_disabled">
|
||||
<intent
|
||||
android:action="cc.winboll.studio.positions.App.ACTION_OPEN_APPPLUS"
|
||||
android:targetPackage="cc.winboll.studio.positions"
|
||||
android:targetClass="cc.winboll.studio.positions.activities.ShortcutActionActivity"
|
||||
android:data="open_appplus" />
|
||||
|
||||
<categories android:name="android.shortcut.conversation" />
|
||||
</shortcut>
|
||||
</shortcuts>
|
||||
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- 切换启动入口的快捷菜单 -->
|
||||
<shortcut
|
||||
android:shortcutId="close_appplus"
|
||||
android:enabled="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:shortcutShortLabel="@string/close_appplus"
|
||||
android:shortcutLongLabel="@string/close_appplus"
|
||||
android:shortcutDisabledMessage="@string/appplus_close_disabled">
|
||||
<intent
|
||||
android:action="cc.winboll.studio.positions.App.ACTION_CLOSE_APPPLUS"
|
||||
android:targetPackage="cc.winboll.studio.positions"
|
||||
android:targetClass="cc.winboll.studio.positions.activities.ShortcutActionActivity"
|
||||
android:data="close_appplus" />
|
||||
|
||||
<categories android:name="android.shortcut.conversation" />
|
||||
</shortcut>
|
||||
</shortcuts>
|
||||
Reference in New Issue
Block a user