Commit Graph

78507 Commits

Author SHA1 Message Date
Hyunyoung Song f89aec74d3 resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp am: 3e906a925c
am: 724e51e88d

* commit '724e51e88dea60401102d00ecf87b63f565e09bf':

Change-Id: If4fb5799c28e7f1a1f12be3b1f9fd517cf5c3f39
2016-04-21 02:53:05 +00:00
Sunny Goyal 89ef5e7fdf resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp
am: 1b1b84e96a

* commit '1b1b84e96a30b30d1df11948eccdf3bb0a821233': (219 commits)
  Passing the full image and crop hint when setting the wallpaper
  Prompt to set URI wallpapers on lock screen (missed before).
  Fixing wrong grid size definitions
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Giving proper workspace description when the launcher is not loaded.
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Talkback: return correct row index inside AllApps b/27108673 b/26546781
  Add dialog to set Default Wallpaper on lock screen for N+.
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  Disable "Set wallpaper" action bar when no tile is selected.
  Prompt users to set wallpaper on lockscreen on N+.
  Removing dependency on getApplicationInfo method added in N
  Calling start/stop listening in onStart/onStop
  Fixing a typo from <array> to <string-array>
  Make com.android.launcher3.action.LAUNCH intent explicit b/27967359
  Fixing debug log
  Listen on new broadcasts for profile changes.
  No need to differentiate package event into app or updated based on a package is being updated or not
  Embedding the icon pixel size in the cache DB version. This causes the cache to get reset when the icon size changes, for eg, in case of display scale changes
  ...

Change-Id: Id20a2fd47cd4aed84182bc228e2a89070931910e
2016-04-21 02:53:05 +00:00
Hyunyoung Song 724e51e88d resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp
am: 3e906a925c

* commit '3e906a925c05824546c48776836a6f727271f625':

Change-Id: I9dce3069f215363b02c42d569e559cdf20998ddb
2016-04-21 00:42:05 +00:00
Hyunyoung Song 3e906a925c resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp
Change-Id: I7e619acb70767f5db5004a40e160ef6487aea78b
2016-04-20 17:20:53 -07:00
Hyunyoung Song 1b1b84e96a resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp
Change-Id: I9fdb4b870c11cd9ef1d46727496839743217fac3
2016-04-20 17:03:16 -07:00
Sunny Goyal f82aba03a7 merged ub-launcher3-burnaby-nyc, and resolved conflicts b/28269144 Change-Id: Ie884be65901b8d9c6a912944094b8c45796162ee
am: 7520e49

* commit '7520e492e75a517b7ff41452318dd56bb9a74c8c': (219 commits)
  Passing the full image and crop hint when setting the wallpaper
  Prompt to set URI wallpapers on lock screen (missed before).
  Fixing wrong grid size definitions
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Giving proper workspace description when the launcher is not loaded.
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library
  Talkback: return correct row index inside AllApps b/27108673 b/26546781
  Add dialog to set Default Wallpaper on lock screen for N+.
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime registered broadcast receiver
  Disable "Set wallpaper" action bar when no tile is selected.
  Prompt users to set wallpaper on lockscreen on N+.
  Removing dependency on getApplicationInfo method added in N
  Calling start/stop listening in onStart/onStop
  Fixing a typo from <array> to <string-array>
  Make com.android.launcher3.action.LAUNCH intent explicit b/27967359
  Fixing debug log
  Listen on new broadcasts for profile changes.
  No need to differentiate package event into app or updated based on a package is being updated or not
  Embedding the icon pixel size in the cache DB version. This causes the cache to get reset when the icon size changes, for eg, in case of display scale changes
  ...

Change-Id: I5b2af74a5bb37df9c220cef8eb671288a686c38c
2016-04-20 23:21:54 +00:00
Hyunyoung Song 7520e492e7 merged ub-launcher3-burnaby-nyc, and resolved conflicts
b/28269144
Change-Id: Ie884be65901b8d9c6a912944094b8c45796162ee
2016-04-20 11:41:00 -07:00
Hyunyoung Song eb25bef72b Fix recyclerview res path
am: 77c2636

* commit '77c263660ef0f1041e627df0f415743f30dcf075':
  Fix recyclerview res path

Change-Id: Icf965521cebc8330e2d6c9c7545ddfef114cc81a
2016-04-20 17:38:11 +00:00
Hyunyoung Song 77c263660e Fix recyclerview res path
Manually cherry picking ag/943086

Change-Id: I37b75a04e3fff61b4bd42625a060c41e0fe7e85d
(cherry picked from commit bcc53286c2)
2016-04-20 17:28:01 +00:00
Hyunyoung Song bcc53286c2 Fix recyclerview res path
Manually cherry picking ag/943086

Change-Id: I37b75a04e3fff61b4bd42625a060c41e0fe7e85d
2016-04-19 22:24:40 -07:00
Hyunyoung Song d1d86d9ed0 Refactor UserEventDispatcher (1/2) b/28269657
am: aa95365

* commit 'aa953654279d7cca29682d85111e398ea1f20390':
  Refactor UserEventDispatcher (1/2) b/28269657

Change-Id: I33e1d3c59fb8368a8cfe52b8132d64b33813716f
2016-04-20 01:37:46 +00:00
Hyunyoung Song aa95365427 Refactor UserEventDispatcher (1/2)
b/28269657

Change-Id: I1083e6f73f42ac1986428a39c6b532050e595ac6
2016-04-19 18:30:24 -07:00
Baligh Uddin c49f7850e9 Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary
am: fdec0f9  -s ours

* commit 'fdec0f9205bb06274d707eea8855bdbe89333295':
  Import translations. DO NOT MERGE

Change-Id: I468e94a59b451a46384b773a18cae8d8b8aae9b4
2016-04-19 16:09:24 +00:00
Baligh Uddin fdec0f9205 Merge "Import translations. DO NOT MERGE" into ub-launcher3-calgary 2016-04-19 15:56:39 +00:00
Baligh Uddin 37c4e9bdda Merge "Import translations. DO NOT MERGE" into ub-launcher3-master 2016-04-19 15:56:37 +00:00
Baligh Uddin f4ecaa258c Import translations. DO NOT MERGE
Change-Id: Ia594dbb558f7beb6933e63eac91fdc310537fa25
Auto-generated-cl: translation import
2016-04-19 02:04:54 -07:00
Baligh Uddin 2e8ec7e3ef Import translations. DO NOT MERGE
Change-Id: If9c08424dedf67ada131561400790a3aec22cfb2
Auto-generated-cl: translation import
2016-04-19 02:03:51 -07:00
Ed Tam 8a23e82ba3 Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp
am: 529970a

* commit '529970a1d61dca77e25057335a2e7bb8c3dc9c11':

Change-Id: I7e30a23b3423617926b885682bb461f0d4d591d9
2016-04-19 06:39:30 +00:00
Ed Tam c90a01ca6a Fix RecyclerView resource path am: 43d0156 am: 3655a7d
am: e97fdee

* commit 'e97fdeed1949e558191c0a3557c432ca4a46b2bb':
  Fix RecyclerView resource path

Change-Id: I4645e0493b82ecd7b33ed37b3e65dd534c88491c
2016-04-19 06:39:29 +00:00
Android Build Merger (Role) 529970a1d6 Merge "Fix RecyclerView resource path am: 43d0156 am: a6fb1e6" into nyc-mr1-dev-plus-aosp 2016-04-19 06:36:14 +00:00
Ed Tam 06e2c9a3be Fix RecyclerView resource path am: 43d0156
am: a6fb1e6

* commit 'a6fb1e6e4fa581a01923fa20fa92284577ed56c8':
  Fix RecyclerView resource path

Change-Id: Ia5ae69fe1614e0eb18f0e5274e49bfecfa3884ba
2016-04-19 06:36:07 +00:00
Ed Tam e97fdeed19 Fix RecyclerView resource path am: 43d0156
am: 3655a7d

* commit '3655a7dd98033b0f13baeca0346c7b03f2c0c81e':
  Fix RecyclerView resource path

Change-Id: I7e3e12009ce4312b4f8515bb7e702c233efbe57d
2016-04-19 06:36:07 +00:00
Ed Tam 3655a7dd98 Fix RecyclerView resource path
am: 43d0156

* commit '43d015643b001b0835227c60a3932833dcbb3ed9':
  Fix RecyclerView resource path

Change-Id: I90a65e528e59e54995f5075707a6e6148e5cbad0
2016-04-19 06:33:33 +00:00
Ed Tam a6fb1e6e4f Fix RecyclerView resource path
am: 43d0156

* commit '43d015643b001b0835227c60a3932833dcbb3ed9':
  Fix RecyclerView resource path

Change-Id: I80ea41f3c9ff7edb3e14f3494533e1a7bdd2ac6b
2016-04-19 06:33:33 +00:00
Ed Tam 43d015643b Fix RecyclerView resource path
Bug: 28245713

Change-Id: I37b75a04e3fff61b4bd42625a060c41e0fe7e85d
Signed-off-by: Ed Tam <etam@google.com>
2016-04-18 19:15:44 -07:00
Sunny Goyal fceb9ff0f5 Passing the full image and crop hint when setting the wallpaper
Bug: 25454157
Change-Id: Ia0ae7dd4963b72cd7902622847deedfcb5a0eca2
2016-04-18 16:36:37 -07:00
Sunny Goyal 4a6fab15dd Merge "Removing Launcher broadcast support from Launcher3" into ub-launcher3-calgary
am: b660759

* commit 'b660759f52984389c5276d9d903170a99b23bed3':
  Removing Launcher broadcast support from Launcher3

Change-Id: I4ee1428d654f541a46f6ce89c685245d963c228a
2016-04-18 20:32:41 +00:00
Sunny Goyal b660759f52 Merge "Removing Launcher broadcast support from Launcher3" into ub-launcher3-calgary 2016-04-18 20:24:40 +00:00
Sunny Goyal e190f2867c Adding some utility methods for thread verification
am: 6388b2c

* commit '6388b2c61b17bd6988f4243ad206c193a1e567c1':
  Adding some utility methods for thread verification

Change-Id: I0b043b43a1c6dd69bf7cbca7f74ef9d61b28a559
2016-04-18 16:59:20 +00:00
Sunny Goyal 6388b2c61b Adding some utility methods for thread verification
Change-Id: I3fb6a1b860bba8a6efe413dd2698f972dc3e2506
2016-04-15 18:03:50 -07:00
Sunny Goyal 46ab2276f9 Removing Launcher broadcast support from Launcher3
Change-Id: Ibaf5fe1465d3858b060fc2958194cf60f22a11db
2016-04-15 13:02:04 -07:00
Sunny Goyal 261433eb7e Removing some deprecated callbacks
am: 5340584

* commit '534058492ff7d9a8a75b0fe709bddb6c3f6dcd79':
  Removing some deprecated callbacks

Change-Id: I5904271480b2952a1317cc97bf7f01363068a9d3
2016-04-14 21:19:55 +00:00
Sunny Goyal 534058492f Removing some deprecated callbacks
Change-Id: I3361383fe19faa64d862bbf879edb8c09937dc6f
2016-04-14 12:30:40 -07:00
Sunny Goyal a7abe8828f Removing first launcher broadcast
am: 53b7ce1

* commit '53b7ce18f4dcbc52d84829103b87917363cbaf05':
  Removing first launcher broadcast

Change-Id: I61f7e6e1b19353f80bbee70caad94623a7374575
2016-04-14 19:21:18 +00:00
Sunny Goyal 53b7ce18f4 Removing first launcher broadcast
Change-Id: I225205a219cf2e0f27bb3c78cbdad1a3429d466f
2016-04-14 11:25:56 -07:00
Tony Wickham 0a197dbbf6 Prompt to set URI wallpapers on lock screen (missed before).
Change-Id: I5328a9861ce2843aba36ecad172eb0e364a816a0
2016-04-13 15:04:30 -07:00
Hyunyoung Song a6563d7e11 Refactor UserEventLogging, Add predictedRank, replace Bundle with Proto
am: ddec1c7

* commit 'ddec1c739ef37c3a042982b8943fe42e04b65f4c':
  Refactor UserEventLogging, Add predictedRank, replace Bundle with Proto

Change-Id: Ib793476ccb6670a20edc6dc7e16bf589b544c4a1
2016-04-13 18:13:24 +00:00
Hyunyoung Song ddec1c739e Refactor UserEventLogging, Add predictedRank, replace Bundle with Proto
b/26494415
- Removed bundle object that became redundant now that we have LauncherEvent proto
- Combined Stats and UserEventLogger as they are effectively doing same thing
- Removed parent field inside Target
- added predictedRank target inside Target

b/27967359
- make com.android.launcher3.action.LAUNCH broadcast explicit
Later CL: finish packageName/intent/componentHash/predictedRank fields

Change-Id: I441fb46c834f73e58a4d2324e8da7971e8713ec8
2016-04-13 10:58:33 -07:00
Sunny Goyal ddd6d96d5f Fixing wrong grid size definitions
Bug: 27958565
Change-Id: Icabc651552bbf6483fedbaeb52745c48d418f9ea
(cherry picked from commit 1ab22630a0)
2016-04-13 17:36:45 +00:00
Sunny Goyal 701fd494fe Removing WallpaperPicker from Launcher3
am: 30a7161

* commit '30a716157b748258e5461fe783298ba7c740835f':
  Removing WallpaperPicker from Launcher3

Change-Id: Ie9ae9e0bcb6f5e3d5be03dc72c33aa2a221d6418
2016-04-13 16:53:01 +00:00
Sunny Goyal 30a716157b Removing WallpaperPicker from Launcher3
Launcher3 will no longer include a wallpaper picker.
Eventually it will just point to the system wallpaper settings where
user can choose from all the installed pickers

Change-Id: Ib5832fa7e451610acd4b2d34ee48fe36e3699d26
2016-04-12 17:59:16 -07:00
Sunny Goyal 4e04695cde Merge "Giving proper workspace description when the launcher is not loaded." into ub-launcher3-burnaby-nyc 2016-04-13 00:44:18 +00:00
Adam Cohen 2ae39859a9 [DO NOT MERGE] Address some spacing issues in all apps related to new support library am: d797327 -s ours
am: 3405080  -s ours

* commit '34050809574ed0c054ec3e322b80981d4b5d79ac':
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library

Change-Id: Ie0c6af23b9375944b58e56784fe549c1594a59b0
2016-04-12 23:57:49 +00:00
Adam Cohen 3405080957 [DO NOT MERGE] Address some spacing issues in all apps related to new support library
am: d797327  -s ours

* commit 'd797327b79c5ded53f698201af5abb7d779ddfa9':
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library

Change-Id: I56782e75b708ee451be2dbe3ece34d30c700c4e0
2016-04-12 23:55:04 +00:00
Adam Cohen f47e5ceafd [DO NOT MERGE] Address some spacing issues in all apps related to new support library
am: d797327  -s ours

* commit 'd797327b79c5ded53f698201af5abb7d779ddfa9':
  [DO NOT MERGE] Address some spacing issues in all apps related to new support library

Change-Id: I8c38d1c542f1143dd7c9f330795229b4a03c7ac8
2016-04-12 23:55:03 +00:00
Adam Cohen 9c6f32c2aa [DO NOT MERGE] Address some spacing issues in all apps related to new support library
issue 27581978

Change-Id: If7a1ea19aa586bb3de6bde960b16e59f86061227
(cherry picked from commit d797327b79)
2016-04-12 23:46:16 +00:00
Sunny Goyal e9557d7aad Giving proper workspace description when the launcher is not loaded.
am: 5be3e4c

* commit '5be3e4cc529f75b894d4603c9fd1342b370766e0':
  Giving proper workspace description when the launcher is not loaded.

Change-Id: I13684173a45e23e6a1add5495280457bf5b274ba
2016-04-12 23:41:11 +00:00
Sunny Goyal 850a943133 Giving proper workspace description when the launcher is not loaded.
Bug: 27326504
Change-Id: Ifc30221f756d75064a4baf5f3bfc71b8f590b4b1

Conflicts:
	src/com/android/launcher3/Workspace.java
2016-04-12 16:39:10 -07:00
Hyunyoung Song 1124f2017a Merge "Talkback: return correct row index inside AllApps b/27108673 b/26546781" into ub-launcher3-burnaby-nyc 2016-04-12 23:17:31 +00:00
Sunny Goyal 5be3e4cc52 Giving proper workspace description when the launcher is not loaded.
Bug: 27326504
Change-Id: Ifc30221f756d75064a4baf5f3bfc71b8f590b4b1
2016-04-12 16:11:59 -07:00