OSDN Git Service
George Mount [Wed, 5 Sep 2012 22:01:20 +0000 (15:01 -0700)]
Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
George Mount [Wed, 5 Sep 2012 20:14:16 +0000 (13:14 -0700)]
Change lightcycle call to be in Gallery's package
Bug
7076869
Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
Bobby Georgescu [Wed, 5 Sep 2012 20:00:04 +0000 (13:00 -0700)]
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
Bobby Georgescu [Wed, 5 Sep 2012 18:33:05 +0000 (11:33 -0700)]
Merge "Reskin: darker gray placeholder colors in gallery" into gb-ub-photos-arches
Angus Kong [Tue, 4 Sep 2012 10:05:45 +0000 (18:05 +0800)]
Move LightCycle checking to the closed source.
bug:
7076779
Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
Owen Lin [Wed, 5 Sep 2012 07:59:34 +0000 (00:59 -0700)]
Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches
Bobby Georgescu [Tue, 4 Sep 2012 23:50:00 +0000 (16:50 -0700)]
Reskin: darker gray placeholder colors in gallery
Bug:
7106371
Bug:
7050303
Change-Id: I68eaa46ef4632778d5f9b6fb2c57d513e8c4c433
Baligh Uddin [Tue, 4 Sep 2012 19:02:07 +0000 (12:02 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Tue, 4 Sep 2012 18:51:56 +0000 (11:51 -0700)]
Increase threshold for logging texture size warnings
Bug:
7094140
Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
Owen Lin [Tue, 4 Sep 2012 08:54:39 +0000 (01:54 -0700)]
Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
Owen Lin [Tue, 4 Sep 2012 07:29:11 +0000 (00:29 -0700)]
Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
Owen Lin [Tue, 4 Sep 2012 07:17:18 +0000 (15:17 +0800)]
Make a time jump when user clicks outsides the scrubber.
bug:
7080593
Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
Owen Lin [Tue, 4 Sep 2012 03:44:57 +0000 (11:44 +0800)]
Set inMutable to true if we may reuse the bitmap.
bug:
7092330
Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
Hung-ying Tyan [Tue, 4 Sep 2012 01:56:00 +0000 (09:56 +0800)]
Fix NPE in CropImage.changeExifImageSizeTag().
Bug:
7099850
Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
Owen Lin [Mon, 3 Sep 2012 06:27:27 +0000 (23:27 -0700)]
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:58 +0000 (20:12 -0700)]
Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:43 +0000 (20:12 -0700)]
Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:27 +0000 (20:12 -0700)]
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:12:12 +0000 (20:12 -0700)]
Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
Hung-ying Tyan [Mon, 3 Sep 2012 03:11:35 +0000 (20:11 -0700)]
Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
Baligh Uddin [Fri, 31 Aug 2012 14:33:05 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c4f92160aade1405f96383212cda95f6b75f38f
Auto-generated-cl: translation import
Earl Ou [Fri, 31 Aug 2012 02:52:18 +0000 (10:52 +0800)]
Handle other header tag in ExifParser before APP1
Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
Earl Ou [Fri, 31 Aug 2012 01:59:20 +0000 (09:59 +0800)]
Handle mis-ordered APP segment in ExifOutputStream
Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
Wu-cheng Li [Fri, 31 Aug 2012 07:52:54 +0000 (00:52 -0700)]
Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-arches
Wu-cheng Li [Thu, 30 Aug 2012 08:44:32 +0000 (16:44 +0800)]
Use FLAG_SHOW_WHEN_LOCKED for secure album.
The activity needs this flag to be on top of the lock screen
when the camera is started from the secure lock screen.
bug:
5955016
Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
Wu-Cheng Li [Fri, 31 Aug 2012 06:26:53 +0000 (23:26 -0700)]
Merge "Add api check for FLAG_SECURE." into gb-ub-photos-arches
Ahbong Chang [Thu, 30 Aug 2012 07:16:50 +0000 (15:16 +0800)]
Add api check for FLAG_SECURE.
Bug:
7023285
Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
Baligh Uddin [Fri, 31 Aug 2012 05:23:44 +0000 (22:23 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Earl Ou [Fri, 31 Aug 2012 01:55:58 +0000 (09:55 +0800)]
Remove the parameter of getAllExifTags() in IfdData
Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
Earl Ou [Fri, 31 Aug 2012 01:58:49 +0000 (09:58 +0800)]
Fix some typos and style in previous CL
Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
Earl Ou [Thu, 30 Aug 2012 04:02:43 +0000 (12:02 +0800)]
Save EXIF info to cropped picasa image with the new EXIF lib.
Bug:
5248023
Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
Earl Ou [Thu, 30 Aug 2012 04:01:05 +0000 (12:01 +0800)]
Add prefix to GPS tag in ExifTag
Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
Earl Ou [Wed, 29 Aug 2012 07:45:30 +0000 (15:45 +0800)]
Re-save Exif info for cropped local image
Bug:
5248023
Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
Owen Lin [Thu, 30 Aug 2012 07:51:55 +0000 (00:51 -0700)]
Merge "ExifOutputStream" into gb-ub-photos-arches
Owen Lin [Wed, 29 Aug 2012 03:53:10 +0000 (11:53 +0800)]
Remove unused resources and fix some warnings.
Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
Owen Lin [Thu, 30 Aug 2012 07:36:53 +0000 (15:36 +0800)]
Fix NPE when deleting a photo in Clustering mode.
bug:
7075760
Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
Hung-ying Tyan [Thu, 30 Aug 2012 06:55:33 +0000 (23:55 -0700)]
Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
Hung-ying Tyan [Thu, 30 Aug 2012 06:52:55 +0000 (23:52 -0700)]
Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
Earl Ou [Tue, 28 Aug 2012 10:39:49 +0000 (18:39 +0800)]
ExifOutputStream
Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
Earl Ou [Wed, 29 Aug 2012 04:12:24 +0000 (12:12 +0800)]
Add equals() function in ExifData, IfdData, and ExifTag
Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
Earl Ou [Wed, 29 Aug 2012 02:21:23 +0000 (10:21 +0800)]
Redesign the set function of ExifTag
Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
Owen Lin [Thu, 30 Aug 2012 02:45:37 +0000 (19:45 -0700)]
Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
Baligh Uddin [Thu, 30 Aug 2012 00:36:06 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I381c77c04e94bce19bde5edd7ce7057b54fa2a8f
Auto-generated-cl: translation import
Bobby Georgescu [Wed, 29 Aug 2012 23:30:50 +0000 (16:30 -0700)]
Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
Bobby Georgescu [Tue, 28 Aug 2012 21:42:57 +0000 (14:42 -0700)]
Reskin: Correctly position rotated thumbs in album listing
Bug:
7067732
Bug:
7050303
Changing the slots to be non-square surfaced a small math
error, and also raised the question of where exactly to
render the texture. The solution that makes the most sense
given the current design is to fit the thumbnail (which is
always square in our case) in the largest square that fits
inside the slot, and aligned to the top.
Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
Angus Kong [Fri, 24 Aug 2012 11:30:08 +0000 (19:30 +0800)]
Invoke LightCycle viewer for panoramas.
1. Add SUPPORT_PANORAMA_VIEW to supported operations.
2. Add helper methods in LightCycleHelper:
a. checks if the image file is a panorama.
b. invokes the panorama view activity.
bug:
6912297
Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
Hung-ying Tyan [Wed, 29 Aug 2012 09:31:41 +0000 (02:31 -0700)]
Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
Owen Lin [Wed, 29 Aug 2012 08:36:08 +0000 (16:36 +0800)]
Fix OOM in TileImageView.
The problem is we keep too many decoded images in the upload queue.
Those images will be free after it getting uploaded.
However, there is a bug which suspend the uploading sometimes.
Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da
fix:
6995091
Owen Lin [Wed, 29 Aug 2012 08:46:38 +0000 (01:46 -0700)]
Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
Hung-ying Tyan [Wed, 29 Aug 2012 06:15:32 +0000 (14:15 +0800)]
Fix pinch out gesture for film strip mode on gingerbread.
On crespo running Android 2.3.6, a pinch out gesture results in the following
call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence
for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp().
The call sequence for a pinch out gesture in JB is: onDown() and then onUp().
Base on these observations, a condition is added in onSingleTapUp() to filter
out the false alarm where onSingleTapUp() is called within a pinch out gesture.
Bug:
7023717
Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
Earl Ou [Tue, 28 Aug 2012 10:33:14 +0000 (18:33 +0800)]
Save the offset of next IFD in the IfdData
Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
Hung-ying Tyan [Wed, 29 Aug 2012 07:22:17 +0000 (00:22 -0700)]
Merge "Save ByteOrder in the ExifData" into gb-ub-photos-arches
Earl Ou [Tue, 28 Aug 2012 10:29:09 +0000 (18:29 +0800)]
Save ByteOrder in the ExifData
This is useful for decoding undefined data.
Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
Wu-cheng Li [Wed, 29 Aug 2012 06:41:42 +0000 (14:41 +0800)]
Old panorama only supports ICS and forward.
bug:
7075249
Change-Id: I0b5884459a417444966ac88284056a182104a68b
Owen Lin [Tue, 28 Aug 2012 10:04:00 +0000 (18:04 +0800)]
Fix NPE in viewing single image.
bug:
7052228
Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
Baligh Uddin [Tue, 28 Aug 2012 23:19:54 +0000 (16:19 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Bobby Georgescu [Mon, 27 Aug 2012 18:48:35 +0000 (11:48 -0700)]
Reskin: Launch photos in lights-out mode
Bug:
7050303
- Launch photos in lights out mode when opening from album
- One last missing call to super.onCreate added in
ManageCachePage
Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
Baligh Uddin [Tue, 28 Aug 2012 18:57:10 +0000 (11:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3d0c37f225b2bef282b536f5305c79c0f014367
Auto-generated-cl: translation import
Owen Lin [Mon, 27 Aug 2012 02:01:22 +0000 (10:01 +0800)]
Fix some UI bugs in using SherlockActionBar.
- Use sherlock's verion of requestWindowFeature.
- Use sherlock's theme in Custom selection list.
bug:
6927267
Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
Wu-cheng Li [Sun, 26 Aug 2012 16:10:38 +0000 (00:10 +0800)]
Disable action bar home button and menu items in secure album.
All menu items are disabled except delete.
bug:
5955016
Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
Wu-cheng Li [Tue, 28 Aug 2012 07:11:30 +0000 (00:11 -0700)]
Merge "Register STILL_IMAGE_CAMERA_SECURE intent in the manifest." into gb-ub-photos-arches
Wu-cheng Li [Sat, 25 Aug 2012 13:10:04 +0000 (21:10 +0800)]
Add api check for camera HDR.
bug:
7054776
Change-Id: Id551b7f1d76168b7735f0a48c19619431b93b66e
Teng-Hui Zhu [Thu, 23 Aug 2012 23:45:11 +0000 (16:45 -0700)]
add the menu button to support trimming
This is only visible for video item.
Change-Id: I17f8e902f3560cc8524f890705c020901331df74
Bobby Georgescu [Mon, 27 Aug 2012 06:47:19 +0000 (23:47 -0700)]
Reskin: tweaks to colors and spacings to match mocks
Bug:
7050303
- Call super.onCreate in ActivityState subclasses in
order to correctly initialize background colors,
correcting oversight in previous change
- Tweak background and label colors to match mocks
- Tweak grid spacings to match mocks
Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
Wu-cheng Li [Mon, 27 Aug 2012 09:50:53 +0000 (02:50 -0700)]
Merge "Add secure album support for lock screen camera." into gb-ub-photos-arches
Wu-cheng Li [Wed, 22 Aug 2012 11:15:35 +0000 (19:15 +0800)]
Add secure album support for lock screen camera.
Secure album only shows the media items added by
the camera.
bug:
5955016
Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
Angus Kong [Mon, 27 Aug 2012 09:05:21 +0000 (02:05 -0700)]
Merge "Add LightCycle helper class." into gb-ub-photos-arches
Angus Kong [Mon, 27 Aug 2012 04:47:21 +0000 (12:47 +0800)]
Add LightCycle helper class.
LightCycleHelper also receives event of package changes to get updated.
bug:
6912297
Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
Bobby Georgescu [Sat, 25 Aug 2012 06:25:23 +0000 (23:25 -0700)]
Reskin: show placeholder color before album label is ready
Bug:
7050303
Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
Bobby Georgescu [Sat, 25 Aug 2012 06:59:28 +0000 (23:59 -0700)]
Make transition from album page to photo page even smoother
Bug:
6979922
Bug:
7050303
Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
Bobby Georgescu [Thu, 23 Aug 2012 01:26:03 +0000 (18:26 -0700)]
Offer to launch camera when Gallery completely empty
Bug:
7009464
Rather than showing a blank screen, alerts the user that
the gallery is empty and offers to launch the camera, if
the device has one.
Change-Id: I0bf71f1cbe7c96a4dc063b5d38b9a282538234c9
Owen Lin [Mon, 27 Aug 2012 04:34:46 +0000 (21:34 -0700)]
Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
Owen Lin [Fri, 24 Aug 2012 04:25:57 +0000 (12:25 +0800)]
Uses ActionBarSherlock in Gallery
bug:
6927267
Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
Hung-ying Tyan [Mon, 27 Aug 2012 03:14:48 +0000 (20:14 -0700)]
Merge "Read thumbnail into ExifData" into gb-ub-photos-arches
Earl Ou [Thu, 16 Aug 2012 02:41:57 +0000 (10:41 +0800)]
Read thumbnail into ExifData
Change-Id: Iccc0fbbda1734795ff431075bade700ca5076a08
Baligh Uddin [Mon, 27 Aug 2012 00:00:42 +0000 (17:00 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Wu-cheng Li [Sun, 26 Aug 2012 15:53:13 +0000 (23:53 +0800)]
Register STILL_IMAGE_CAMERA_SECURE intent in the manifest.
bug:
7053266
Change-Id: I6468a82f5da5afb98316d52b31117f1cc4f82fb9
Bobby Georgescu [Thu, 23 Aug 2012 20:05:53 +0000 (13:05 -0700)]
Ongoing reskin of Gallery app
Bug:
7050303
Moved the majority of color settings from hardcoded to
colors.xml in order to allow rapid iteration with UX input.
Started changing some colors and layouts to reflect latest
UX mocks.
Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
Baligh Uddin [Fri, 24 Aug 2012 19:07:09 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87825a89d6a75f65528c6d2edfcebd753040457e
Auto-generated-cl: translation import
Hung-ying Tyan [Fri, 24 Aug 2012 09:00:01 +0000 (02:00 -0700)]
Merge "Rename TiffInputStream to CountedDataInputStream" into gb-ub-photos-arches
Hung-ying Tyan [Fri, 24 Aug 2012 08:59:38 +0000 (01:59 -0700)]
Merge "Re-design ExifParser for some strange Exif header" into gb-ub-photos-arches
Earl Ou [Wed, 15 Aug 2012 09:55:55 +0000 (17:55 +0800)]
Rename TiffInputStream to CountedDataInputStream
Change-Id: Ie52ab9a58ae47f5a0b9113c6006844b73567d864
Earl Ou [Tue, 14 Aug 2012 09:50:08 +0000 (17:50 +0800)]
Re-design ExifParser for some strange Exif header
The previous design failed to parser file with strange IFD position.
Therefore we need a new design.
Change-Id: I9f008a9259df6ef7d9a5022e126d6f25069e3d00
Owen Lin [Fri, 24 Aug 2012 07:49:54 +0000 (00:49 -0700)]
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
Owen Lin [Fri, 24 Aug 2012 07:09:42 +0000 (15:09 +0800)]
Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""
This reverts commit
13da281769d4558c42d86a54536ff6da6826b0ac.
Owen Lin [Fri, 24 Aug 2012 05:02:22 +0000 (13:02 +0800)]
Revert "Uses ActionBarSherlock library in MovieActivity."
This reverts commit
89b437722a24d0c7d6e2acffc30c215f22814234.
Owen Lin [Wed, 22 Aug 2012 09:34:21 +0000 (17:34 +0800)]
Uses ActionBarSherlock library in MovieActivity.
bug:
6927267
Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
Baligh Uddin [Thu, 23 Aug 2012 23:58:21 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida5be8ba77e6596843caeddd998a7e67f4c565d6
Auto-generated-cl: translation import
Bobby Georgescu [Thu, 23 Aug 2012 21:35:18 +0000 (14:35 -0700)]
Fix NPE, ANRs in Gallery
Bug:
7041482
Bug:
7041769
Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
Bobby Georgescu [Thu, 23 Aug 2012 20:23:02 +0000 (13:23 -0700)]
Fix ANRs in Gallery
Bug:
7041769
Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
Keun young Park [Thu, 23 Aug 2012 16:44:46 +0000 (09:44 -0700)]
fix mips build
- LOCAL_SDK_VERSION should be defined always
Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1
Baligh Uddin [Thu, 23 Aug 2012 03:33:59 +0000 (20:33 -0700)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
Pin Ting [Thu, 23 Aug 2012 02:50:39 +0000 (10:50 +0800)]
Hide UI entry of effects recording.
Change-Id: Ie35526e7fbc38c56c0c19653ba50fcafb685791b
Baligh Uddin [Wed, 22 Aug 2012 17:26:43 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id5bb3597b3c9762b0dd564f8ec0eed458e88140a
Auto-generated-cl: translation import
Wu-Cheng Li [Wed, 22 Aug 2012 08:49:51 +0000 (01:49 -0700)]
Merge "Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread." into gb-ub-photos-arches
Ahbong Chang [Wed, 22 Aug 2012 06:38:18 +0000 (14:38 +0800)]
Use GalleryUtils.getSelectionModePrompt instead of duplicated code.
Change-Id: I1cdffb8b8d87f25f91382c3602f12c327ec11849
Ahbong Chang [Tue, 21 Aug 2012 06:06:51 +0000 (14:06 +0800)]
Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread.
Bug:
6982707
Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade
Wu-cheng Li [Wed, 22 Aug 2012 07:43:56 +0000 (00:43 -0700)]
Merge "Add API check for view transformation properties." into gb-ub-photos-arches
Wu-cheng Li [Wed, 22 Aug 2012 07:31:01 +0000 (15:31 +0800)]
Add API check for view transformation properties.
Ex: View.setTranslationX, View.setPivotX, etc.
bug:
6982696
Change-Id: Ib9fc5f3d7c83d99ced47dcd79dfee430d7ad67c8
Yuli Huang [Wed, 22 Aug 2012 06:29:18 +0000 (23:29 -0700)]
Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches