OSDN Git Service
Adam Cohen [Fri, 15 Nov 2013 18:22:05 +0000 (10:22 -0800)]
am
582a3694: Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
* commit '
582a36949b4e86feedaaceea0ae0f96dc746640c':
Adding method to get the search bar bounds.
Adam Cohen [Fri, 15 Nov 2013 18:22:05 +0000 (10:22 -0800)]
am
3a14eeb5: Bit of code cleanup (issue
11648206)
* commit '
3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd':
Bit of code cleanup (issue
11648206)
Adam Cohen [Fri, 15 Nov 2013 18:22:04 +0000 (10:22 -0800)]
am
202e4fda: Merge "Fix for transparent CustomContent screen (issue
11549096)" into jb-ub-now-jolly-elf
* commit '
202e4fdafb5e4e94dd925905c1553bd92e61985e':
Fix for transparent CustomContent screen (issue
11549096)
Winson Chung [Fri, 15 Nov 2013 18:22:02 +0000 (10:22 -0800)]
am
b427f30e: Merge "Require valid arrays when adding and binding new Apps. (Bug
11627095)" into jb-ub-now-jolly-elf
* commit '
b427f30e4da1141ec0266cfad8cbfb63a1760bc6':
Require valid arrays when adding and binding new Apps. (Bug
11627095)
Winson Chung [Fri, 15 Nov 2013 18:22:01 +0000 (10:22 -0800)]
am
89ee93e0: Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
* commit '
89ee93e0f8b6ac1ed6aefc2b940d1606f2027491':
Use the icon bounds for all calculations.
Adam Cohen [Fri, 15 Nov 2013 18:21:59 +0000 (10:21 -0800)]
am
4e2683a4: Merge "Fix issue where custom content would be invisible (issue
11644432)" into jb-ub-now-jolly-elf
* commit '
4e2683a4b582d28bb320308b5e5f3541ae1aa310':
Fix issue where custom content would be invisible (issue
11644432)
Adam Cohen [Fri, 15 Nov 2013 18:21:56 +0000 (10:21 -0800)]
am
e9b198fd: Merge "Change the way view ids are assigned (issue
11627801)" into jb-ub-now-jolly-elf
* commit '
e9b198fd7414771db3df259ce696f0070ea9a153':
Change the way view ids are assigned (issue
11627801)
Adam Copp [Fri, 15 Nov 2013 17:24:15 +0000 (09:24 -0800)]
am
3dc3ecda: Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
* commit '
3dc3ecda281c078de9511dcb6349db1df629220a':
Hooks for subclasses to react to home presses.
Adam Cohen [Fri, 15 Nov 2013 17:09:22 +0000 (17:09 +0000)]
Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
Adam Cohen [Fri, 15 Nov 2013 16:51:22 +0000 (16:51 +0000)]
Bit of code cleanup (issue
11648206)
Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
Adam Cohen [Fri, 15 Nov 2013 16:50:13 +0000 (08:50 -0800)]
am
b79a48c2: Merge "Add logging for NPE (issue
11627249)" into jb-ub-now-jolly-elf
* commit '
b79a48c251947d4bceb289953485f2aef6e55852':
Add logging for NPE (issue
11627249)
Adam Cohen [Fri, 15 Nov 2013 16:50:12 +0000 (08:50 -0800)]
am
17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue
11627191)" into jb-ub-now-jolly-elf
* commit '
17e1aeac4bcc15a53eb0e2139d8690aa788a4320':
Fix CellLayout UNSPECIFIED exception (issue
11627191)
Winson Chung [Fri, 15 Nov 2013 16:50:04 +0000 (08:50 -0800)]
am
e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)" into jb-ub-now-jolly-elf
* commit '
e248b83797e6b6ce128085560ad0c5b900413bf2':
Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)
Adam Cohen [Fri, 15 Nov 2013 13:21:04 +0000 (13:21 +0000)]
Merge "Fix for transparent CustomContent screen (issue
11549096)" into jb-ub-now-jolly-elf
Adam Cohen [Fri, 15 Nov 2013 10:56:16 +0000 (10:56 +0000)]
Fix for transparent CustomContent screen (issue
11549096)
Change-Id: I8b371e3c556a80b7eb3e145a8d4b78f15421046a
Winson Chung [Thu, 24 Oct 2013 18:01:54 +0000 (11:01 -0700)]
Adding method to get the search bar bounds.
Change-Id: Iec2fe0992cc666432ba6b9eac7ee8bf63e49b146
Adam Cohen [Thu, 14 Nov 2013 19:59:37 +0000 (11:59 -0800)]
am
f0f2ffae: Fix issue where extra page hangs around (issue
11634172)
* commit '
f0f2ffaedc39b4657a3b7e24a4a3a90e08ed087f':
Fix issue where extra page hangs around (issue
11634172)
Adam Cohen [Thu, 14 Nov 2013 19:59:37 +0000 (11:59 -0800)]
am
c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
* commit '
c361b6fe3ed3a7e38547cb1c366750f6c3317fef':
Small tweaks to custom content management
Michael Jurka [Thu, 14 Nov 2013 19:59:34 +0000 (11:59 -0800)]
am
bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
* commit '
bf292a0bd37959aa3b67df2daec3656f8178af68':
Fix wallpaper cropping bugs
Adam Cohen [Thu, 14 Nov 2013 19:59:31 +0000 (11:59 -0800)]
am
ab087b9f: Fix NPE we\'re seeing in feedback (issue
11626428)
* commit '
ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8':
Fix NPE we're seeing in feedback (issue
11626428)
Adam Cohen [Thu, 14 Nov 2013 19:59:26 +0000 (11:59 -0800)]
am
2777273a: Add method to determine if Launcher is using vertical bars
* commit '
2777273a2a5c710f26726ada0fe4a8f33da57b52':
Add method to determine if Launcher is using vertical bars
Winson Chung [Thu, 14 Nov 2013 19:50:28 +0000 (19:50 +0000)]
Merge "Require valid arrays when adding and binding new Apps. (Bug
11627095)" into jb-ub-now-jolly-elf
Winson Chung [Thu, 14 Nov 2013 19:30:05 +0000 (11:30 -0800)]
Require valid arrays when adding and binding new Apps. (Bug
11627095)
Change-Id: I8f2a4dc70bf376d804885f433ab20064823ebaac
Winson Chung [Thu, 14 Nov 2013 19:19:24 +0000 (19:19 +0000)]
Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
Winson Chung [Wed, 13 Nov 2013 23:47:05 +0000 (15:47 -0800)]
Use the icon bounds for all calculations.
- Fixes a drag and drop issue when the dynamic
grid scales icons down, due to the drawable bounds
not being equal to their bitmap sizes.
Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
Adam Cohen [Thu, 14 Nov 2013 17:10:57 +0000 (17:10 +0000)]
Merge "Fix issue where custom content would be invisible (issue
11644432)" into jb-ub-now-jolly-elf
Adam Cohen [Thu, 14 Nov 2013 16:43:59 +0000 (16:43 +0000)]
Fix issue where custom content would be invisible (issue
11644432)
-> Also making sure to clear the widget frame when moving to custom
content.
Change-Id: I460c707f1b6ec34bc6d78c9df43a613d9bfced3c
Adam Cohen [Thu, 14 Nov 2013 16:22:36 +0000 (16:22 +0000)]
Merge "Change the way view ids are assigned (issue
11627801)" into jb-ub-now-jolly-elf
Adam Cohen [Thu, 14 Nov 2013 11:09:14 +0000 (11:09 +0000)]
Change the way view ids are assigned (issue
11627801)
Change-Id: I4d9c0542ea3ac581c4a9f4da68824f0b498ea337
Adam Copp [Thu, 14 Nov 2013 14:04:44 +0000 (14:04 +0000)]
Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
Adam Cohen [Wed, 13 Nov 2013 11:46:26 +0000 (11:46 +0000)]
Merge "Add logging for NPE (issue
11627249)" into jb-ub-now-jolly-elf
Adam Copp [Tue, 12 Nov 2013 16:26:04 +0000 (16:26 +0000)]
Hooks for subclasses to react to home presses.
This provides the nessecary hooks for GEL so that it can prevent
scrolling to the home screen when a search is open, instead choosing to
dismiss the search.
Bug:
11128544
Change-Id: I3c1b67bc271c1342db4a0abac364f2923bdeba3a
Adam Cohen [Wed, 13 Nov 2013 11:36:03 +0000 (11:36 +0000)]
Merge "Fix CellLayout UNSPECIFIED exception (issue
11627191)" into jb-ub-now-jolly-elf
Adam Cohen [Wed, 13 Nov 2013 11:29:49 +0000 (11:29 +0000)]
Add logging for NPE (issue
11627249)
Change-Id: I75352f9eb1249fa5cc46d05cd7c168a868c6f7b7
Winson Chung [Tue, 12 Nov 2013 19:37:07 +0000 (19:37 +0000)]
Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)" into jb-ub-now-jolly-elf
Adam Cohen [Tue, 12 Nov 2013 11:33:14 +0000 (11:33 +0000)]
Fix CellLayout UNSPECIFIED exception (issue
11627191)
Change-Id: Id2f840a804c51e8c61bb28882796059584e4c8bb
Adam Cohen [Tue, 12 Nov 2013 11:44:58 +0000 (11:44 +0000)]
Fix issue where extra page hangs around (issue
11634172)
Change-Id: Ia0900c9fc07bc587259e36ed17816eaf519b10dc
Adam Cohen [Tue, 12 Nov 2013 10:43:13 +0000 (10:43 +0000)]
Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
Winson Chung [Mon, 11 Nov 2013 23:47:45 +0000 (15:47 -0800)]
Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)
Change-Id: I21173f114228ba43172af9074d2ac1fadeee9886
Michael Jurka [Mon, 11 Nov 2013 20:07:03 +0000 (20:07 +0000)]
Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
Adam Cohen [Mon, 11 Nov 2013 18:49:56 +0000 (18:49 +0000)]
Small tweaks to custom content management
-> Never allow the custom content overhang onto the viewport when
it is not the current page
-> Never fade the custom content screen as a consequence of scrolling
Change-Id: I91a4cfb3f740ee8b429084fce1c96258bac8dd9e
Michael Jurka [Mon, 11 Nov 2013 15:44:44 +0000 (16:44 +0100)]
Fix wallpaper cropping bugs
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
Change-Id: I42be79c68b883a6e329dcc5645d7db6cd6e3eeeb
Adam Cohen [Mon, 11 Nov 2013 15:37:21 +0000 (15:37 +0000)]
Fix NPE we're seeing in feedback (issue
11626428)
Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5
Adam Cohen [Mon, 11 Nov 2013 14:00:56 +0000 (14:00 +0000)]
Add method to determine if Launcher is using vertical bars
Change-Id: I7e9096cf81b49d213025c6f98708186330448fc0
Michael Jurka [Fri, 8 Nov 2013 16:34:15 +0000 (08:34 -0800)]
am
62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
* commit '
62dacd6797f6aab0f096e440418cd5fe4e9d9ea3':
Uncommenting throw when item not contained in sBgItemsIdMap
Michael Jurka [Fri, 8 Nov 2013 16:32:57 +0000 (16:32 +0000)]
Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
Adam Cohen [Fri, 8 Nov 2013 16:25:08 +0000 (08:25 -0800)]
Uncommenting throw when item not contained in sBgItemsIdMap
-> Improving logging for issue
11580149
Change-Id: I10ce7c4b54a6435302d33bbeba4e8600f69d4920
Michael Jurka [Fri, 8 Nov 2013 16:19:57 +0000 (08:19 -0800)]
am
5fa148a1: am
5bfab60f: Fix NPE in Live Wallpaper loader
* commit '
5fa148a1d9204a3de3177aef18c80506de2879e8':
Fix NPE in Live Wallpaper loader
Michael Jurka [Fri, 8 Nov 2013 16:17:24 +0000 (08:17 -0800)]
am
5bfab60f: Fix NPE in Live Wallpaper loader
* commit '
5bfab60fff6c3da8f8d8e245a496a031f807560d':
Fix NPE in Live Wallpaper loader
Michael Jurka [Fri, 8 Nov 2013 15:59:11 +0000 (16:59 +0100)]
Fix NPE in Live Wallpaper loader
Bug:
11584868
Adam Cohen [Fri, 8 Nov 2013 15:35:15 +0000 (07:35 -0800)]
am
18238d90: am
3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit '
18238d90aec90e4f9e5aebc68133d31b4639b52c':
Fix default wallpaper thumbnail
Adam Cohen [Fri, 8 Nov 2013 15:33:22 +0000 (07:33 -0800)]
am
3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit '
3428b5e9f944e476fa4e5230dc682242198309ce':
Fix default wallpaper thumbnail
Adam Cohen [Fri, 8 Nov 2013 15:32:01 +0000 (07:32 -0800)]
am
46830418: am
2da0a053: Fix small scrolling regression
* commit '
4683041885e6a8338dc3111a9e3f15cc7c62611e':
Fix small scrolling regression
Adam Cohen [Fri, 8 Nov 2013 15:31:04 +0000 (15:31 +0000)]
Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
Adam Cohen [Fri, 8 Nov 2013 15:29:13 +0000 (07:29 -0800)]
am
2da0a053: Fix small scrolling regression
* commit '
2da0a0532752fae8985e3e8a192eb5087cf78aab':
Fix small scrolling regression
Michael Jurka [Fri, 8 Nov 2013 14:45:48 +0000 (15:45 +0100)]
Fix default wallpaper thumbnail
Bug:
11588279
Dave Hawkey [Fri, 8 Nov 2013 14:49:44 +0000 (14:49 +0000)]
Merge "Set insets on newly added views." into jb-ub-now-kermit
Adam Cohen [Fri, 8 Nov 2013 14:28:17 +0000 (06:28 -0800)]
Fix small scrolling regression
-> only cancel scrolling when necessary to avoid
unnecessary snapToDestination() calls
Change-Id: I406bef2453c88d61d25f66be67205ab8fbd69ec9
Dave Hawkey [Thu, 7 Nov 2013 21:26:19 +0000 (14:26 -0700)]
Set insets on newly added views.
This is needed for adding an internal-only dogfood indicator above the
search plate in http://ag/386251.
Bug:
10954064
Change-Id: I72cb0e978a5118ce45f69a493ac631d0c165b237
Winson Chung [Thu, 7 Nov 2013 20:02:09 +0000 (12:02 -0800)]
am
d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
* commit '
d7adbab669f922e02193eaf819ce32518dc70e8d':
Save and restore the correct content type when rotating while in AllApps.
Winson Chung [Thu, 7 Nov 2013 20:02:08 +0000 (12:02 -0800)]
am
88416027: Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
* commit '
88416027a3740dacbd97bd2264f22ba51f5c7e21':
Fixing crash while reordering pages in OverviewMode.
Winson Chung [Thu, 7 Nov 2013 20:02:08 +0000 (12:02 -0800)]
am
c82d2622: Dyanmically lay out overview mode across all orientations and form factors.
* commit '
c82d2622bc7305fd3545fe7df97a30187283113f':
Dyanmically lay out overview mode across all orientations and form factors.
Winson Chung [Thu, 7 Nov 2013 18:52:18 +0000 (18:52 +0000)]
Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
Winson Chung [Thu, 7 Nov 2013 18:51:57 +0000 (18:51 +0000)]
Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
Winson Chung [Wed, 6 Nov 2013 21:23:29 +0000 (13:23 -0800)]
Dyanmically lay out overview mode across all orientations and form factors.
Change-Id: I788bbf289717b30b19afc9ad9d611c85715bc623
Winson Chung [Wed, 6 Nov 2013 22:49:50 +0000 (14:49 -0800)]
Fixing crash while reordering pages in OverviewMode.
Change-Id: I67dcd71a8f15fbc737880306254c766f4dbadc58
Winson Chung [Wed, 6 Nov 2013 23:49:51 +0000 (15:49 -0800)]
Save and restore the correct content type when rotating while in AllApps.
Change-Id: I508832e46c8a2ab3bb53baf8f44b543c4c24aed2
Adam Cohen [Thu, 7 Nov 2013 17:02:42 +0000 (09:02 -0800)]
am
ebb9ebed: am
a1648449: Fixing tiny regression in PagedView spacing
* commit '
ebb9ebed6407a6ff57dd3914d0fa99eb620aca2e':
Fixing tiny regression in PagedView spacing
Adam Cohen [Thu, 7 Nov 2013 17:00:58 +0000 (09:00 -0800)]
am
a1648449: Fixing tiny regression in PagedView spacing
* commit '
a1648449901178da191564a0dd9ecbdf9f971e69':
Fixing tiny regression in PagedView spacing
Michael Jurka [Thu, 7 Nov 2013 12:43:03 +0000 (04:43 -0800)]
am
1beeb0aa: Merge "Revert "Workaround for remove stuck (issue
11080792)"" into jb-ub-now-jolly-elf
* commit '
1beeb0aac278756aaf29392b84287cfa633ad52e':
Revert "Workaround for remove stuck (issue
11080792)"
Michael Jurka [Thu, 7 Nov 2013 12:43:03 +0000 (04:43 -0800)]
am
19d10a58: Don\'t adjust animation play time if not necessary
* commit '
19d10a5822e24b775fe8aefb6ccb5e92345cb7f8':
Don't adjust animation play time if not necessary
Michael Jurka [Thu, 7 Nov 2013 12:42:03 +0000 (12:42 +0000)]
Merge "Revert "Workaround for remove stuck (issue
11080792)"" into jb-ub-now-jolly-elf
Michael Jurka [Wed, 6 Nov 2013 15:37:34 +0000 (16:37 +0100)]
Revert "Workaround for remove stuck (issue
11080792)"
This reverts commit
f72693d907c67a539cdb6643f157fc0ba28c4268.
Michael Jurka [Wed, 6 Nov 2013 16:06:57 +0000 (17:06 +0100)]
Don't adjust animation play time if not necessary
Potential fix for Bug:
11080792
Adam Cohen [Thu, 7 Nov 2013 12:11:15 +0000 (04:11 -0800)]
Fixing tiny regression in PagedView spacing
Change-Id: I7dde2257e6079d540d648fa57a15cf865d594f35
Baligh Uddin [Thu, 7 Nov 2013 04:14:32 +0000 (20:14 -0800)]
am
458a15f7: (-s ours) am
89fbe00d: (-s ours) am
0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '
458a15f732c380dc4ef3b7dbcae2a6a8f5916f09':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:11:08 +0000 (20:11 -0800)]
am
89fbe00d: (-s ours) am
0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '
89fbe00de978c9620e71a030fa0f16cecfd38b3a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:07:11 +0000 (20:07 -0800)]
am
0effb652: (-s ours) am
e0b9a1f7: (-s ours) Import translations. DO NOT MERGE
* commit '
0effb652ec7f24a892fe98b16b0eebc6d2e7c12e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:07:10 +0000 (20:07 -0800)]
am
f0d79e57: (-s ours) Import translations. DO NOT MERGE
* commit '
f0d79e57349a4f18b61e9a380a19124fb6c8d8fd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:06:07 +0000 (20:06 -0800)]
am
0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '
0491f0f16d528179206623a086a353f62863df88':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:04:51 +0000 (20:04 -0800)]
am
e0b9a1f7: (-s ours) Import translations. DO NOT MERGE
* commit '
e0b9a1f72415cdb119356901fd66f5b35115747e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Nov 2013 23:17:36 +0000 (15:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I63c883fb372dc7a7ca7902d281d7a9581de68f3b
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:16:57 +0000 (15:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I077655685f6faa46c09db6f7d7384aaddb08c9f7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:16:19 +0000 (15:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58918dca0bb241091f9b8d14e5062d2581ab6e11
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:15:41 +0000 (15:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6caa0d5f1cda02e40d94d6182dc37342babc3013
Auto-generated-cl: translation import
Baligh Uddin [Tue, 5 Nov 2013 23:26:51 +0000 (15:26 -0800)]
am
3be0912b: (-s ours) am
2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '
3be0912b34cb754ebdb80c07e0d7de062b9b4978':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:23:43 +0000 (15:23 -0800)]
am
349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf
* commit '
349763d0e50a144b3b693b6bf0edca0d1e1dbea2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:23:28 +0000 (15:23 -0800)]
am
2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '
2a44d878b7ac0cf4b3dba5a7800bed984f87d677':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:21:53 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit
Baligh Uddin [Tue, 5 Nov 2013 23:21:50 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf
Baligh Uddin [Tue, 5 Nov 2013 23:21:46 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 06:26:01 +0000 (22:26 -0800)]
am
45fee32b: am
b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
* commit '
45fee32bc3d25ed021f58a9bf76863f617cef65e':
Ensuring that widget ids are cleaned up
Adam Cohen [Tue, 5 Nov 2013 06:26:01 +0000 (22:26 -0800)]
am
d120e994: am
c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
* commit '
d120e994f63dfed8032a5c91ce3b8334d82646c6':
Fix bug where cancelling config activity leaves user stuck in bad state
Adam Cohen [Tue, 5 Nov 2013 06:04:19 +0000 (22:04 -0800)]
am
e33f8259: am
5c6474da: Merge "Fix problem with where PagedView could get stuck (issue
11314889)" into jb-ub-now-jetsonic
* commit '
e33f825908a02fc6fa4d4054672b3bbd7708427e':
Fix problem with where PagedView could get stuck (issue
11314889)
Adam Cohen [Tue, 5 Nov 2013 02:30:09 +0000 (18:30 -0800)]
am
b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
* commit '
b2af6076c70cd3d09e23a4999803b3108aa469f4':
Ensuring that widget ids are cleaned up
Adam Cohen [Tue, 5 Nov 2013 02:26:31 +0000 (02:26 +0000)]
Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 02:21:24 +0000 (18:21 -0800)]
Ensuring that widget ids are cleaned up
Change-Id: I89f7bd3fccdc730128189beb51680e3ee76e3524
Adam Cohen [Tue, 5 Nov 2013 02:14:59 +0000 (18:14 -0800)]
am
c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
* commit '
c18e4a926530cf458bdc67abfdd60488ff62d758':
Fix bug where cancelling config activity leaves user stuck in bad state
Adam Cohen [Tue, 5 Nov 2013 02:10:36 +0000 (02:10 +0000)]
Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 01:57:36 +0000 (17:57 -0800)]
Fix bug where cancelling config activity leaves user stuck in bad state
Change-Id: I774cc6e46006f623c97812c85023b228128430fe
OSDN Git Service
