devbox
weixin_40725706
这个屌丝很懒，什么也没留下！
关注作者
热门标签
热门文章
当前位置:   article > 正文

android launcher进入编辑模式创建文件夹_launcher创建文件夹

作者：weixin_40725706 | 2024-08-09 09:57:15

赞

踩

launcher创建文件夹
  1. diff --git a/frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java b/frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java
  2. index 3adb7529033..d92e2ccc77b 100644
  3. --- a/frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java
  4. +++ b/frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BadgedImageView.java
  5. @@ -128,7 +128,8 @@ public class BadgedImageView extends ImageView {
  6.  
  7.          Path iconPath = PathParser.createPathFromPathData(
  8.                  getResources().getString(com.android.internal.R.string.config_icon_mask));
  9. -        mDotRenderer = new DotRenderer(mPositioner.getBubbleSize(),iconPath, DEFAULT_PATH_SIZE);
  10. +        mDotRenderer = new DotRenderer(mPositioner.getBubbleSize(),
  11. +                iconPath, DEFAULT_PATH_SIZE);
  12.      }
  13.  
  14.      public void showDotAndBadge(boolean onLeft) {
  15. @@ -208,7 +209,8 @@ public class BadgedImageView extends ImageView {
  16.       * @param iconPath The new icon path to use when calculating dot position.
  17.       */
  18.      void drawDot(Path iconPath) {
  19. -        mDotRenderer = new DotRenderer(mPositioner.getBubbleSize(),iconPath, DEFAULT_PATH_SIZE);
  20. +        mDotRenderer = new DotRenderer(mPositioner.getBubbleSize(),
  21. +                iconPath, DEFAULT_PATH_SIZE);
  22.          invalidate();
  23.      }
  24.  
  25. diff --git a/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_selected.png b/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_selected.png
  26. deleted file mode 100755
  27. index f34b16b8b2a..00000000000
  28. Binary files a/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_selected.png and /dev/null differ
  29. diff --git a/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_unselect.png b/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_unselect.png
  30. deleted file mode 100755
  31. index 8aecf242925..00000000000
  32. Binary files a/frameworks/libs/systemui/iconloaderlib/res/drawable-hdpi/icon_unselect.png and /dev/null differ
  33. diff --git a/frameworks/libs/systemui/iconloaderlib/res/values/colors.xml b/frameworks/libs/systemui/iconloaderlib/res/values/colors.xml
  34. index 40b77aeda90..70582c2e252 100644
  35. --- a/frameworks/libs/systemui/iconloaderlib/res/values/colors.xml
  36. +++ b/frameworks/libs/systemui/iconloaderlib/res/values/colors.xml
  37. @@ -21,6 +21,4 @@
  38.  
  39.      <!-- Yellow 600, used for highlighting "important" conversations in settings & notifications -->
  40.      <color name="important_conversation">#f9ab00</color>
  41. -    <color name="icon_badge_color">#e83242</color>
  42. -    <color name="icon_badge_color1">#00ff00</color>
  43.  </resources>
  44. diff --git a/frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java b/frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
  45. index 8672d24c216..97a0fd3ffca 100644
  46. --- a/frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
  47. +++ b/frameworks/libs/systemui/iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java
  48. @@ -29,11 +29,6 @@ import android.graphics.Rect;
  49.  import android.graphics.RectF;
  50.  import android.util.Log;
  51.  import android.view.ViewDebug;
  52. -import android.content.Context;
  53. -import android.graphics.BitmapFactory;
  54. -import android.graphics.Typeface;
  55. -import static android.graphics.Paint.ANTI_ALIAS_FLAG;
  56. -import static android.graphics.Paint.FILTER_BITMAP_FLAG;
  57.  
  58.  /**
  59.   * Used to draw a notification dot on top of an icon.
  60. @@ -68,88 +63,7 @@ public class DotRenderer {
  61.          mLeftDotPosition = getPathPoint(iconShapePath, pathSize, -1);
  62.          mRightDotPosition = getPathPoint(iconShapePath, pathSize, 1);
  63.      }
  64. -    //alan add start
  65. -    public DotRenderer(Context context,int iconSizePx, Path iconShapePath, int pathSize) {
  66. -        int size = Math.round(SIZE_PERCENTAGE * iconSizePx);
  67. -        ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.TRANSPARENT);
  68. -        builder.ambientShadowAlpha = 88;
  69. -        mBackgroundWithShadow = builder.setupBlurForSize(size).createPill(size, size);
  70. -        mCircleRadius = builder.radius;
  71. -
  72. -        mBitmapOffset = -mBackgroundWithShadow.getHeight() * 0.5f; // Same as width.
  73.  
  74. -        // Find the points on the path that are closest to the top left and right corners.
  75. -        mLeftDotPosition = getPathPoint(iconShapePath, pathSize, -1);
  76. -        mRightDotPosition = getPathPoint(iconShapePath, pathSize, 1);
  77. -        initOtherParams(context);
  78. -    }
  79. -
  80. -    private Bitmap mSelectedIcon;
  81. -    private Bitmap mUnselectIcon;
  82. -    private Rect mBitmapRect = new Rect();
  83. -    private RectF mTargetRect = new RectF();
  84. -    private int mNoticeDotcolor;
  85. -    private Paint mNoticeTextPaint;
  86. -
  87. -    private void initOtherParams(Context context) {
  88. -        mSelectedIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon_selected);
  89. -        mUnselectIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.icon_unselect);
  90. -
  91. -        mBitmapRect.set(0, 0, mSelectedIcon.getWidth(), mSelectedIcon.getHeight());
  92. -        mTargetRect.set(-mCircleRadius, -mCircleRadius, mCircleRadius, mCircleRadius);
  93. -
  94. -        mNoticeDotcolor = context.getColor(R.color.icon_badge_color);
  95. -
  96. -        mNoticeTextPaint = new Paint(ANTI_ALIAS_FLAG);
  97. -        mNoticeTextPaint.setTextSize(mCircleRadius * 1.45f);
  98. -        mNoticeTextPaint.setColor(Color.WHITE);
  99. -        mNoticeTextPaint.setTextAlign(Paint.Align.CENTER);
  100. -    }
  101. -
  102. -    private void resetTargetRect() {
  103. -        mTargetRect.set(-mCircleRadius, -mCircleRadius, mCircleRadius, mCircleRadius);
  104. -    }
  105. -
  106. -    private void drawDots(Canvas canvas, DrawParams params){
  107. -        resetTargetRect();
  108. -        if (drawSelectDot(canvas, params)) {
  109. -        } else if (params.noticeCount > 0) {
  110. -            drawNotificationDot(canvas, params);
  111. -        }
  112. -    }
  113. -
  114. -    private boolean drawSelectDot(Canvas canvas, DrawParams params) {
  115. -        if (!params.isInSelectMode) return false;
  116. -        Bitmap bitmap = params.isSelected ? mSelectedIcon : mUnselectIcon;
  117. -        canvas.drawBitmap(bitmap, mBitmapRect, mTargetRect, mCirclePaint);
  118. -        return params.isInSelectMode;
  119. -    }
  120. -
  121. -    private void drawNotificationDot(Canvas canvas, DrawParams params) {
  122. -        mCirclePaint.setColor(mNoticeDotcolor);
  123. -        if (params.isDotTypeBadges) {
  124. -            canvas.drawRoundRect(mTargetRect, mCircleRadius, mCircleRadius, mCirclePaint);
  125. -            return;
  126. -        }
  127. -
  128. -        int noticeCount = params.noticeCount;
  129. -        if (noticeCount > 99) {
  130. -            mTargetRect.set(-mCircleRadius - 16, -mCircleRadius - 1, mCircleRadius + 16, mCircleRadius + 1);
  131. -        } else if (noticeCount > 9) {
  132. -            mTargetRect.set(-mCircleRadius - 5, -mCircleRadius - 1, mCircleRadius + 5, mCircleRadius + 1);
  133. -        }
  134. -        canvas.drawRoundRect(mTargetRect, mCircleRadius + 1, mCircleRadius + 1, mCirclePaint);
  135. -
  136. -        String unreadText = noticeCount > 99 ? "99+" : String.valueOf(noticeCount);
  137. -
  138. -        float centerX = mTargetRect.left + mTargetRect.width() / 2.0f;
  139. -        float centerY = mTargetRect.top + mTargetRect.height() / 2.0f;
  140. -
  141. -        Paint.FontMetrics fontMetrics = mNoticeTextPaint.getFontMetrics();
  142. -        float offsetY = (fontMetrics.ascent + fontMetrics.bottom) / 2f;
  143. -        canvas.drawText(unreadText, centerX, centerY - offsetY, mNoticeTextPaint);
  144. -    }
  145. -    //alan add end
  146.      private static float[] getPathPoint(Path path, float size, float direction) {
  147.          float halfSize = size / 2;
  148.          // Small delta so that we don't get a zero size triangle
  149. @@ -205,11 +119,10 @@ public class DotRenderer {
  150.          canvas.translate(dotCenterX + offsetX, dotCenterY + offsetY);
  151.          canvas.scale(params.scale, params.scale);
  152.  
  153. -//        mCirclePaint.setColor(Color.BLACK);
  154. -//        canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);
  155. -//        mCirclePaint.setColor(params.color);
  156. -//        canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);
  157. -        drawDots(canvas,params);
  158. +        mCirclePaint.setColor(Color.BLACK);
  159. +        canvas.drawBitmap(mBackgroundWithShadow, mBitmapOffset, mBitmapOffset, mCirclePaint);
  160. +        mCirclePaint.setColor(params.color);
  161. +        canvas.drawCircle(0, 0, mCircleRadius, mCirclePaint);
  162.          canvas.restore();
  163.      }
  164.  
  165. @@ -226,29 +139,5 @@ public class DotRenderer {
  166.          /** Whether the dot should align to the top left of the icon rather than the top right. */
  167.          @ViewDebug.ExportedProperty(category = "notification dot")
  168.          public boolean leftAlign;
  169. -
  170. -        //alan add start
  171. -        public boolean isInSelectMode = false;
  172. -
  173. -        public boolean isSelected = false;
  174. -
  175. -        public boolean isDotTypeBadges = false;
  176. -
  177. -        public int noticeCount;
  178. -
  179. -        @Override
  180. -        public String toString() {
  181. -            return "DrawParams{" +
  182. -                    "color=" + color +
  183. -                    ", iconBounds=" + iconBounds +
  184. -                    ", scale=" + scale +
  185. -                    ", leftAlign=" + leftAlign +
  186. -                    ", isInSelectMode=" + isInSelectMode +
  187. -                    ", isSelected=" + isSelected +
  188. -                    ", isDotTypeBadges=" + isDotTypeBadges +
  189. -                    ", noticeCount=" + noticeCount +
  190. -                    '}';
  191. -        }
  192. -        //alan add end
  193.      }
  194.  }
  195. diff --git a/packages/apps/Launcher3/res/drawable-xxhdpi/icon_create_folder.png b/packages/apps/Launcher3/res/drawable-xxhdpi/icon_create_folder.png
  196. deleted file mode 100755
  197. index eec2d4e7041..00000000000
  198. Binary files a/packages/apps/Launcher3/res/drawable-xxhdpi/icon_create_folder.png and /dev/null differ
  199. diff --git a/packages/apps/Launcher3/res/layout/custome_groupalign_target_bar.xml b/packages/apps/Launcher3/res/layout/custome_groupalign_target_bar.xml
  200. index 3fd381e64f1..df189c0a887 100755
  201. --- a/packages/apps/Launcher3/res/layout/custome_groupalign_target_bar.xml
  202. +++ b/packages/apps/Launcher3/res/layout/custome_groupalign_target_bar.xml
  203. @@ -13,32 +13,55 @@
  204.       See the License for the specific language governing permissions and
  205.       limitations under the License.
  206.  -->
  207. -<com.android.launcher3.DropTargetBar xmlns:android="http://schemas.android.com/apk/res/android"
  208. +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  209.      android:layout_width="match_parent"
  210.      android:layout_height="@dimen/dynamic_grid_drop_target_size"
  211.      android:layout_gravity="center_horizontal|top"
  212.      android:focusable="false"
  213. -    android:alpha="0"
  214. +    android:alpha="1"
  215. +    android:orientation="horizontal"
  216.      android:theme="@style/HomeScreenElementTheme"
  217.      android:visibility="invisible">
  218. -
  219. -    <!-- Delete target -->
  220. -    <com.android.launcher3.CreateFolderDropTarget
  221. +    <View
  222. +        android:layout_width="20dp"
  223. +        android:layout_height="wrap_content"
  224. +        android:layout_weight="0.4"
  225. +        android:gravity="center"
  226. +        android:layout_gravity="center"/>
  227. +    <TextView
  228.          android:id="@+id/group_target_text"
  229. -        style="@style/DropTargetButton"
  230. -        android:layout_width="match_parent"
  231. -        android:layout_height="match_parent"
  232. +        style="@style/DropTargetButtonBase"
  233. +        android:layout_width="80dp"
  234. +        android:layout_height="wrap_content"
  235.          android:layout_gravity="center"
  236. +        android:layout_weight="1"
  237.          android:gravity="center"
  238. +        android:drawablePadding="3dp"
  239. +        android:drawableLeft="@mipmap/folder_group"
  240.          android:text="@string/group_drop_target_label" />
  241. -
  242. -    <com.android.launcher3.AlignDropTarget
  243. +    <View
  244. +        android:layout_width="20dp"
  245. +        android:layout_height="wrap_content"
  246. +        android:layout_gravity="center"
  247. +        android:layout_weight="0.4"
  248. +        android:gravity="center"/>
  249. +    <!-- Uninstall target -->
  250. +    <TextView
  251.          android:id="@+id/align_target_text"
  252. -        style="@style/DropTargetButton"
  253. -        android:layout_width="match_parent"
  254. -        android:layout_height="match_parent"
  255. +        style="@style/DropTargetButtonBase"
  256. +        android:layout_width="80dp"
  257. +        android:layout_height="wrap_content"
  258.          android:layout_gravity="center"
  259.          android:gravity="center"
  260. +        android:layout_weight="1"
  261. +        android:drawablePadding="3dp"
  262. +        android:drawableLeft="@mipmap/align_icon"
  263.          android:text="@string/align_drop_target_label" />
  264. -
  265. -</com.android.launcher3.DropTargetBar>
  266. \ No newline at end of file
  267. +    <View
  268. +        android:layout_width="20dp"
  269. +        android:layout_height="wrap_content"
  270. +        android:layout_gravity="center"
  271. +        android:layout_weight="0.4"
  272. +        android:gravity="center"/>
  273. +    <!-- Delete target -->
  274. +</LinearLayout>
  275. \ No newline at end of file
  276. diff --git a/packages/apps/Launcher3/res/values/strings.xml b/packages/apps/Launcher3/res/values/strings.xml
  277. index 562631b0520..bd7b1e35357 100644
  278. --- a/packages/apps/Launcher3/res/values/strings.xml
  279. +++ b/packages/apps/Launcher3/res/values/strings.xml
  280. @@ -496,8 +496,8 @@
  281.      <!-- Label for uninstall drop target (from the device).
  282.           May appear next to remove_drop_target_label [CHAR_LIMIT=20]-->
  283.      <string name="uninstall_drop_target_label">Uninstall</string>
  284. -    <string name="group_drop_target_label" >Create Folder</string>
  285. -    <string name="align_drop_target_label" >Align</string>
  286. +    <string name="group_drop_target_label" >"成组"</string>
  287. +    <string name="align_drop_target_label" >"对齐"</string>
  288.      <!-- Label for app info drop target. [CHAR_LIMIT=20] -->
  289.      <string name="app_info_drop_target_label">App info</string>
  290.      <!-- Label for install drop target. [CHAR_LIMIT=20] -->
  291. diff --git a/packages/apps/Launcher3/src/com/android/launcher3/AlignDropTarget.java b/packages/apps/Launcher3/src/com/android/launcher3/AlignDropTarget.java
  292. deleted file mode 100755
  293. index eb2e0c52630..00000000000
  294. --- a/packages/apps/Launcher3/src/com/android/launcher3/AlignDropTarget.java
  295. +++ /dev/null
  296. @@ -1,121 +0,0 @@
  297. -package com.android.launcher3;
  298. -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_CANCEL;
  299. -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ITEM_DROPPED_ON_REMOVE;
  300. -import static com.android.launcher3.logging.StatsLogManage
声明：本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：https://www.wpsshop.cn/w/weixin_40725706/article/detail/952663
推荐阅读
相关标签

Copyright © 2003-2013 www.wpsshop.cn 版权所有，并保留所有权利。

  

闽ICP备14008679号