OSDN Git Service
Ed Heyl [Wed, 25 Jul 2012 22:04:00 +0000 (15:04 -0700)]
resolve conflicts w/
4f174f1d27adbde6f50e11ee3a8eaf162a030284
Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
Ed Heyl [Wed, 25 Jul 2012 21:52:36 +0000 (14:52 -0700)]
resolved conflicts w/
0ede734d0780a968c9c345f99a18f9f8b9fc02cd
Change-Id: I50900698a590e8d84a6cbcc560f95209d3a6d110
Winson Chung [Wed, 25 Jul 2012 07:06:51 +0000 (00:06 -0700)]
am
c93e5ae1: Binding AllApps synchronously. (Bug
6855061)
* commit '
c93e5ae12018bb214099ff88a48cc21580aec4c3':
Binding AllApps synchronously. (Bug
6855061)
Winson Chung [Tue, 24 Jul 2012 03:48:26 +0000 (20:48 -0700)]
Binding AllApps synchronously. (Bug
6855061)
- Also ensuring that we restore to the settling page index if it is in motion
Change-Id: I9c6760383113f7614f6cb962ab6562b0e7eb7138
Adam Cohen [Wed, 25 Jul 2012 05:56:14 +0000 (22:56 -0700)]
am
1462de39: Ensuring that restoreInstanceState is being called promptly for synchronously bound page
* commit '
1462de39f01cec0ba785386532719cb0207dd827':
Ensuring that restoreInstanceState is being called promptly for synchronously bound page
Adam Cohen [Wed, 25 Jul 2012 05:34:36 +0000 (22:34 -0700)]
Ensuring that restoreInstanceState is being called promptly for synchronously bound page
Change-Id: I0e71c29f553ad360ec42a6a0b2529d16cbddd437
Adam Cohen [Tue, 24 Jul 2012 02:52:38 +0000 (19:52 -0700)]
am
bf5529bd: am
a13a2f2a: Fixing issue where defered unbind was running after synchronous bind. (Bug
6858398, Bug
6863181)
* commit '
bf5529bd401ad471658b878f313e32ed8639b479':
Fixing issue where defered unbind was running after synchronous bind. (Bug
6858398, Bug
6863181)
Adam Cohen [Mon, 23 Jul 2012 21:48:39 +0000 (14:48 -0700)]
am
a13a2f2a: Fixing issue where defered unbind was running after synchronous bind. (Bug
6858398, Bug
6863181)
* commit '
a13a2f2a7bd0550d1ad973f760ff25e1a4137c43':
Fixing issue where defered unbind was running after synchronous bind. (Bug
6858398, Bug
6863181)
Adam Cohen [Mon, 23 Jul 2012 21:29:15 +0000 (14:29 -0700)]
Fixing issue where defered unbind was running after synchronous bind. (Bug
6858398, Bug
6863181)
Change-Id: I03dc3ae18528901cc88c79638a8495c1ab8d61af
Winson Chung [Fri, 20 Jul 2012 17:34:39 +0000 (10:34 -0700)]
am
f39ac9b2: (-s ours) am
36e6c5bb: Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
* commit '
f39ac9b25c158200a124060b3326d0017e4eb601':
Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
Winson Chung [Fri, 20 Jul 2012 02:16:51 +0000 (19:16 -0700)]
am
36e6c5bb: Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
* commit '
36e6c5bb232f3a876753b91fb9ec604cda8664a5':
Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
Winson Chung [Thu, 19 Jul 2012 21:53:05 +0000 (14:53 -0700)]
Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
- Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home
- Enabling rotation in master.
Change-Id: I291b9d76b20244e9028b6f62164430bc3606644c
Winson Chung [Thu, 19 Jul 2012 21:53:05 +0000 (14:53 -0700)]
Disabling synchronous binding when returning home from another app while orientation has changed. (Bug
6792288)
- Fixing issue where we were reverting to the first page of the workspace after launching an application from all apps, rotating, and returning home
- Enabling rotation in master.
Change-Id: I291b9d76b20244e9028b6f62164430bc3606644c
Ying Wang [Thu, 19 Jul 2012 18:54:55 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I88db0bd87c0cfcb9896ea0cb6c67a1edcb9fe6bd
Auto-generated-cl: translation import
The Android Open Source Project [Thu, 19 Jul 2012 15:52:28 +0000 (08:52 -0700)]
The Android Open Source Project [Thu, 19 Jul 2012 15:41:13 +0000 (08:41 -0700)]
Reconcile with jb-mr0-release
Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b
The Android Automerger [Thu, 19 Jul 2012 04:44:51 +0000 (21:44 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Adam Cohen [Thu, 19 Jul 2012 03:21:26 +0000 (20:21 -0700)]
am
12a2c9e4: (-s ours) am
d7d37b13: DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug
6792288)
* commit '
12a2c9e41df573166e182d5e97067bfcb535558e':
DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug
6792288)
Adam Cohen [Thu, 19 Jul 2012 03:15:14 +0000 (20:15 -0700)]
am
d7d37b13: DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug
6792288)
* commit '
d7d37b134b7a3b12858ff099069eba369a6b5373':
DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug
6792288)
Winson Chung [Thu, 19 Jul 2012 01:16:38 +0000 (18:16 -0700)]
Fixing issue where we would crash when encountering improper launcher.dbs
Change-Id: Ib07ca56cf1a2a04e2058cc8260d5dd917d525c64
Adam Cohen [Wed, 18 Jul 2012 23:15:08 +0000 (16:15 -0700)]
DO NOT MERGE Adding sycnhronous loading of current page to support seamless rotation. (Bug
6792288)
Change-Id: I341160e8a604cde63443e331f762cebc1ed5ec0c
Winson Chung [Wed, 18 Jul 2012 17:27:56 +0000 (10:27 -0700)]
Merge "Initial changes to synchronously load workspace on rotation."
Winson Chung [Fri, 13 Jul 2012 00:55:31 +0000 (17:55 -0700)]
Initial changes to synchronously load workspace on rotation.
Change-Id: Ia7cf80177fd0aee88aa3f4a731f5d6dc904bea16
Winson Chung [Tue, 17 Jul 2012 19:28:17 +0000 (12:28 -0700)]
Merge "Fixing issue where we were not clearing the set of removed items since the last event. (Bug
6749258)"
Winson Chung [Tue, 17 Jul 2012 03:45:03 +0000 (20:45 -0700)]
Fixing issue where we were not clearing the set of removed items since the last event. (Bug
6749258)
Change-Id: I21ed2810e902e2727959b1a4cc0cd6183b750603
Adam Cohen [Tue, 17 Jul 2012 01:05:26 +0000 (18:05 -0700)]
Merge "Fix issue where widget resize frame overlaps widget (issue
6493388)"
Adam Cohen [Mon, 16 Jul 2012 19:00:08 +0000 (12:00 -0700)]
Merge "Fix issue with push in reordering (bug:
6259603)"
Ying Wang [Mon, 16 Jul 2012 17:14:11 +0000 (10:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80363d7537cdd13abfa564c1ba641f11a9cc6420
Auto-generated-cl: translation import
Adam Cohen [Fri, 13 Jul 2012 22:59:15 +0000 (15:59 -0700)]
Fix issue where widget resize frame overlaps widget (issue
6493388)
Change-Id: Ib1e53a7df49b26ecb19880e58b19876b80cfb12c
Adam Cohen [Fri, 13 Jul 2012 20:41:42 +0000 (13:41 -0700)]
Fix issue with push in reordering (bug:
6259603)
Change-Id: I7ca0abe7f0ef7559ef60f902fb18718fba5a7532
Ying Wang [Fri, 13 Jul 2012 17:34:25 +0000 (10:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I804f740c88f8f2e4e9965cdd6465287a978f89db
Auto-generated-cl: translation import
Adam Cohen [Thu, 12 Jul 2012 23:16:57 +0000 (16:16 -0700)]
Fix occupied issue when switching from folder icon to its final item
Change-Id: I445156ed8f99f0489776043440faa45399fb3888
Adam Cohen [Thu, 12 Jul 2012 22:55:15 +0000 (15:55 -0700)]
Merge "Fix inconsistency when dropping to hotseat"
Adam Cohen [Thu, 12 Jul 2012 22:43:01 +0000 (15:43 -0700)]
Fix inconsistency when dropping to hotseat
Change-Id: I0c186f930713bf195b3966ba5cfeac78220370bd
Winson Chung [Thu, 12 Jul 2012 20:42:16 +0000 (13:42 -0700)]
Merge "Fixing concurrent modification exception. (Bug
6807320)"
Winson Chung [Thu, 12 Jul 2012 18:21:32 +0000 (11:21 -0700)]
Fixing concurrent modification exception. (Bug
6807320)
Change-Id: Id7848612c04f74d867c0ce21105628c162ba9b70
Ying Wang [Thu, 12 Jul 2012 17:36:08 +0000 (10:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id89c9ec0fa7c6697e746b2786413904a2c9dacaf
Auto-generated-cl: translation import
The Android Automerger [Thu, 12 Jul 2012 06:13:27 +0000 (23:13 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Michael Jurka [Wed, 11 Jul 2012 23:41:28 +0000 (16:41 -0700)]
Merge "Adding debug logging to track down missing app icons"
Adam Cohen [Wed, 11 Jul 2012 23:37:22 +0000 (16:37 -0700)]
Merge "Remove a database operation that is not required"
Michael Jurka [Wed, 11 Jul 2012 23:18:24 +0000 (16:18 -0700)]
Adding debug logging to track down missing app icons
Winson Chung [Wed, 11 Jul 2012 14:43:29 +0000 (07:43 -0700)]
am
039f9d38: am
827a5580: Fixing issue where drop target text was not showing in tablet ui. (Bug
6789399)
* commit '
039f9d38edac327b39215582b85ef75dbe6ef006':
Fixing issue where drop target text was not showing in tablet ui. (Bug
6789399)
Winson Chung [Wed, 11 Jul 2012 14:40:53 +0000 (07:40 -0700)]
am
827a5580: Fixing issue where drop target text was not showing in tablet ui. (Bug
6789399)
* commit '
827a55807303c31ee289b352fb300f97562dfa43':
Fixing issue where drop target text was not showing in tablet ui. (Bug
6789399)
Winson Chung [Tue, 10 Jul 2012 23:30:49 +0000 (16:30 -0700)]
Fixing issue where drop target text was not showing in tablet ui. (Bug
6789399)
Change-Id: I619f0a0118e53cfc703870fcc9083bb9bf1855b2
Adam Cohen [Tue, 10 Jul 2012 00:59:50 +0000 (17:59 -0700)]
Remove a database operation that is not required
-> The item will be added to the database by the
Folder, which is a FolderListener
Change-Id: I3f41e3ef58f5829bd0c834901bf239539eb9d0bc
Winson Chung [Tue, 10 Jul 2012 00:34:53 +0000 (17:34 -0700)]
Merge "Fixing issue where the scrolling indicator was stuck while panning pages in spring loaded mode. (Bug
6603301)"
Winson Chung [Tue, 10 Jul 2012 00:32:37 +0000 (17:32 -0700)]
Merge "Fixing issue where toasts were getting queued. (Bug
6572269)"
Winson Chung [Mon, 2 Jul 2012 19:08:15 +0000 (12:08 -0700)]
Fixing issue where the scrolling indicator was stuck while panning pages in spring loaded mode. (Bug
6603301)
Change-Id: I329a20e932ab6c4450a60a24c8ab7c0e090fe64d
Adam Cohen [Mon, 9 Jul 2012 21:52:25 +0000 (14:52 -0700)]
Merge "Trying to track down corrupt database / items disappearing"
Adam Cohen [Fri, 29 Jun 2012 01:12:10 +0000 (18:12 -0700)]
Trying to track down corrupt database / items disappearing
-> Adding logs for all database transactions
-> Adding sanity checks for items in folders, throwing exceptions
if they are violated
-> Reducing database upates when re-arranging items, only
update if values have changed
-> Removed some dead code from ItemInfo (isGesture?)
Change-Id: Ia5cd57d92082f633dbf4aa5d64612cbae2d82bb4
Winson Chung [Mon, 2 Jul 2012 18:47:27 +0000 (11:47 -0700)]
Fixing issue where toasts were getting queued. (Bug
6572269)
Change-Id: Iceb27c4c5a4168beb5a5ae37a0c597e1940bff04
Michael Jurka [Fri, 29 Jun 2012 22:47:55 +0000 (15:47 -0700)]
Merge "Disable hardware layers for drag views"
Michael Jurka [Fri, 29 Jun 2012 22:38:55 +0000 (15:38 -0700)]
Fix memory leak caused by LauncherAnimUtils (doh!)
Change-Id: I04aa243f3871f6837f8a95b2941ee15633b50b66
Michael Jurka [Fri, 29 Jun 2012 22:17:04 +0000 (15:17 -0700)]
Disable hardware layers for drag views
Also, avoiding allocating paint object every time we swipe
The Android Open Source Project [Fri, 29 Jun 2012 15:19:36 +0000 (08:19 -0700)]
The Android Open Source Project [Fri, 29 Jun 2012 15:14:14 +0000 (08:14 -0700)]
Reconcile with jb-release
Change-Id: Id4de428001ead0dc7fd1cc38a594b2704e1879af
Michael Jurka [Thu, 28 Jun 2012 22:35:26 +0000 (15:35 -0700)]
Only enable hardware layers on visible workspace pages
Change-Id: Id82fc76d00a188556460d1a78388d46be56c9c4e
Winson Chung [Thu, 28 Jun 2012 21:02:31 +0000 (14:02 -0700)]
Merge "Removing unnecessary check of shortcut infos (now that we key removals off package names already). (Bug
6755420)"
Michael Jurka [Thu, 28 Jun 2012 20:45:33 +0000 (13:45 -0700)]
Removing unnecessary config parameter for hw accel
Change-Id: Ibbbca9fb93319400332ba27f9cae62b1c0cc4313
Winson Chung [Thu, 28 Jun 2012 19:13:51 +0000 (12:13 -0700)]
Removing unnecessary check of shortcut infos (now that we key removals off package names already). (Bug
6755420)
Change-Id: I13f088503e58eb021a585493e1c55eeccdffea86
The Android Automerger [Thu, 28 Jun 2012 14:04:10 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Winson Chung [Wed, 27 Jun 2012 21:53:14 +0000 (14:53 -0700)]
am
487241fd: am
e76e36f4: Merge "Disallowing touches through the custom workspace cling. (Bug
6721250)" into jb-dev
* commit '
487241fdd71c098695dba07534316d015de08734':
Disallowing touches through the custom workspace cling. (Bug
6721250)
Winson Chung [Wed, 27 Jun 2012 21:50:46 +0000 (14:50 -0700)]
am
e76e36f4: Merge "Disallowing touches through the custom workspace cling. (Bug
6721250)" into jb-dev
* commit '
e76e36f420c4e0ff2198eeadc86a3b2acfa2479a':
Disallowing touches through the custom workspace cling. (Bug
6721250)
Winson Chung [Wed, 27 Jun 2012 21:48:04 +0000 (14:48 -0700)]
Merge "Disallowing touches through the custom workspace cling. (Bug
6721250)" into jb-dev
Winson Chung [Wed, 27 Jun 2012 21:37:48 +0000 (14:37 -0700)]
Disallowing touches through the custom workspace cling. (Bug
6721250)
Change-Id: I0d932716f2095036ee0205f6bd0d28c6b832a9be
Michael Jurka [Wed, 27 Jun 2012 18:48:37 +0000 (11:48 -0700)]
Fix crash when adding shortcuts
The Android Automerger [Tue, 26 Jun 2012 18:11:34 +0000 (11:11 -0700)]
merge in jb-release history after reset to jb-dev
Michael Jurka [Mon, 25 Jun 2012 21:49:02 +0000 (14:49 -0700)]
Adding debug code for LauncherModel crash
Change-Id: I9b8c053707cd5714874006c249651a69378569d2
Michael Jurka [Mon, 25 Jun 2012 21:56:22 +0000 (14:56 -0700)]
Fix build
Change-Id: I34b052159a393842bad707921205ea2778c1cbfe
Winson Chung [Mon, 25 Jun 2012 21:48:43 +0000 (14:48 -0700)]
am
bcff7eda: am
9dc25f06: Merge "Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)" into jb-dev
* commit '
bcff7eda3731b7af254a1d5182766683ea1d46e3':
Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)
Winson Chung [Mon, 25 Jun 2012 21:47:03 +0000 (14:47 -0700)]
am
9dc25f06: Merge "Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)" into jb-dev
* commit '
9dc25f06a870938a2adb976194da78574825e83e':
Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)
Winson Chung [Mon, 25 Jun 2012 21:45:32 +0000 (14:45 -0700)]
Merge "Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)" into jb-dev
Winson Chung [Mon, 25 Jun 2012 21:21:37 +0000 (14:21 -0700)]
Fixing concurrent modification exception when iterating through new apps list. (Bug
6621553)
Change-Id: Idf4fae51c65e0e53520740dd0b2050eeac00b251
Michael Jurka [Mon, 25 Jun 2012 20:06:43 +0000 (13:06 -0700)]
Remove unneeded imports
Change-Id: I96e125c5ddbde7df10847e9514b947c80292ea40
Michael Jurka [Thu, 14 Jun 2012 23:18:21 +0000 (16:18 -0700)]
Compile Launcher against only public apis (level 16)
Also, removing use of TableMaskFilter (last remaining private api)
Change-Id: I2df80605b240352fdf7ef2ebd26b98342149bda3
Winson Chung [Thu, 21 Jun 2012 21:29:52 +0000 (14:29 -0700)]
Merge "Decoupling launcher/workspace package cleanup from the application list (Bug
6602756)"
Michael Jurka [Thu, 21 Jun 2012 21:27:18 +0000 (14:27 -0700)]
Merge "Use getCurrentSizeRange to determine cell dimensions"
Michael Jurka [Thu, 21 Jun 2012 21:13:03 +0000 (14:13 -0700)]
Merge "Remove use of private api ViewGroup.setChildrenLayersEnabled"
Michael Jurka [Thu, 21 Jun 2012 16:38:41 +0000 (09:38 -0700)]
Remove use of private api ViewGroup.setChildrenLayersEnabled
Change-Id: I877bd84c6846ae232e2877e97de95d9344c13e56
Michael Jurka [Thu, 21 Jun 2012 20:46:15 +0000 (13:46 -0700)]
Merge "Remove use of private Display apis"
Winson Chung [Mon, 18 Jun 2012 23:45:43 +0000 (16:45 -0700)]
Decoupling launcher/workspace package cleanup from the application list (Bug
6602756)
- Fixes issues where shortcuts created by wallpaper/widget-only apps are uninstalled.
Change-Id: I94c9d1d71fc34aa2fb7f0660534e616a82ac6f36
Michael Jurka [Thu, 21 Jun 2012 15:36:45 +0000 (08:36 -0700)]
Use getCurrentSizeRange to determine cell dimensions
Change-Id: I7b50ad85594585a3c18838776652c3d873dbd82d
Michael Jurka [Wed, 20 Jun 2012 21:02:10 +0000 (14:02 -0700)]
Remove use of private Display apis
Change-Id: I560a730af20f3068e7904eb9c8bfb29fa5d2c22f
Eric Fischer [Thu, 21 Jun 2012 01:48:04 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I146f917ed9a060d96d8f3306b38a88b5cdc64d2e
Michael Jurka [Mon, 18 Jun 2012 19:52:28 +0000 (12:52 -0700)]
Remove use of private ValueAnimator api
Change-Id: I455edcd17bda83ab51c2c04fa40e66097a4d6975
Michael Jurka [Thu, 14 Jun 2012 23:18:21 +0000 (16:18 -0700)]
Remove unnecessary use of some private APIs
Change-Id: Idaba6833ddf4a8615845ca2f643c458bdeb9c403
Michael Jurka [Tue, 19 Jun 2012 15:29:40 +0000 (08:29 -0700)]
Merge "Removing use of private SearchManager api"
The Android Open Source Project [Tue, 19 Jun 2012 14:20:40 +0000 (07:20 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 14:16:01 +0000 (07:16 -0700)]
Reconcile with jb-release
Change-Id: Id1dce27a5a2dc5fd8af5cafd7501d59f54614df3
The Android Automerger [Tue, 19 Jun 2012 14:04:52 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Tue, 19 Jun 2012 13:16:17 +0000 (06:16 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 13:13:52 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: If9e036e4156d80d4990cb53a8f7a259df27fb7ce
Winson Chung [Mon, 18 Jun 2012 22:31:55 +0000 (15:31 -0700)]
Merge "Launcher-side changes to update packages after the set of app widgets has changed. (Bug
6602951)"
Winson Chung [Mon, 18 Jun 2012 22:31:49 +0000 (15:31 -0700)]
Merge "Fixing issue where dropping items onto side pages might drop them two pages away. (Bug
6433177)"
Winson Chung [Mon, 18 Jun 2012 22:09:17 +0000 (15:09 -0700)]
Fixing issue where dropping items onto side pages might drop them two pages away. (Bug
6433177)
Change-Id: I7fa745c269e63d699671cdaf0b527f2675ce3081
Michael Jurka [Mon, 18 Jun 2012 21:48:04 +0000 (14:48 -0700)]
am
3d8bdd63: am
eb04476d: Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into jb-dev
* commit '
3d8bdd63056435296a4d98eb4f2567c6f40d16fc':
Fix issue where "X" would appear over QSB bar in landscape mode
Michael Jurka [Mon, 18 Jun 2012 21:46:15 +0000 (14:46 -0700)]
am
eb04476d: Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into jb-dev
* commit '
eb04476def775427a4d216c9ce32e53da5ad4765':
Fix issue where "X" would appear over QSB bar in landscape mode
Michael Jurka [Mon, 18 Jun 2012 21:43:56 +0000 (14:43 -0700)]
Merge "Fix issue where "X" would appear over QSB bar in landscape mode" into jb-dev
Michael Jurka [Mon, 18 Jun 2012 21:43:06 +0000 (14:43 -0700)]
am
2561ee84: am
d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev
* commit '
2561ee8453dc41a9d65f7890ea227416d7e8948c':
Add null pointer checks to fix NPEs
Michael Jurka [Mon, 18 Jun 2012 21:40:20 +0000 (14:40 -0700)]
am
d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev
* commit '
d74389d9027a128da85be151670ee43e55feaba5':
Add null pointer checks to fix NPEs
OSDN Git Service
