OSDN Git Service
Doris Liu [Sat, 19 Oct 2013 00:15:30 +0000 (17:15 -0700)]
Fix SRI orientation on manta
Bug:
11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
Ed Heyl [Thu, 17 Oct 2013 00:45:03 +0000 (17:45 -0700)]
merge in klp-release (no-op)
ztenghui [Wed, 16 Oct 2013 23:32:59 +0000 (16:32 -0700)]
am
9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
* commit '
9db9282667d9e272702cd2ee32d7415204084530':
Send an message to decouple the gcam module change.
ztenghui [Wed, 16 Oct 2013 23:10:39 +0000 (23:10 +0000)]
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
ztenghui [Wed, 16 Oct 2013 21:43:26 +0000 (14:43 -0700)]
Send an message to decouple the gcam module change.
In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.
bug:
11252237
Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:53 +0000 (15:13 -0700)]
am
66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad
* commit '
66f3948315b6bf851dcd5d618d96d6fcda49f159':
update camera launcher icon
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:11:27 +0000 (22:11 +0000)]
Merge "update camera launcher icon" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 21:59:36 +0000 (14:59 -0700)]
am
7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
* commit '
7bd95307ecdca5c7661bc3fb1765313ceb62e92a':
Fix shutter covering pie menu
Doris Liu [Wed, 16 Oct 2013 21:57:32 +0000 (21:57 +0000)]
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 19:51:02 +0000 (12:51 -0700)]
Fix shutter covering pie menu
Bug:
11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:34:29 +0000 (10:34 -0700)]
update camera launcher icon
fixed b/
11252230
Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
The Android Automerger [Tue, 15 Oct 2013 22:55:46 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Igor Murashkin [Tue, 15 Oct 2013 21:54:09 +0000 (14:54 -0700)]
am
5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
* commit '
5e82f81a7c7daaf8ac86dbd688b344027f97ff64':
gcam: Fix AF spinner not to reset when changing position
Igor Murashkin [Tue, 15 Oct 2013 21:51:39 +0000 (21:51 +0000)]
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
Igor Murashkin [Tue, 15 Oct 2013 20:43:31 +0000 (13:43 -0700)]
gcam: Fix AF spinner not to reset when changing position
Bug:
10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
Doris Liu [Tue, 15 Oct 2013 20:01:11 +0000 (13:01 -0700)]
am
08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
* commit '
08749a4ed22c5001aa476a9a30df323b00a6df7d':
Dismiss switcher popup when shutter button is clicked
Doris Liu [Tue, 15 Oct 2013 19:58:43 +0000 (19:58 +0000)]
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
Igor Murashkin [Tue, 15 Oct 2013 19:58:05 +0000 (12:58 -0700)]
am
d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
* commit '
d3e75bd748ce2be8fdcb30575bbde9bd07536bd3':
CameraUtil: add float clamp function
Igor Murashkin [Tue, 15 Oct 2013 19:55:18 +0000 (19:55 +0000)]
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
Doris Liu [Tue, 15 Oct 2013 19:51:47 +0000 (12:51 -0700)]
Dismiss switcher popup when shutter button is clicked
Bug:
11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
Erin Dahlgren [Tue, 15 Oct 2013 19:44:49 +0000 (12:44 -0700)]
am
177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
* commit '
177c4b05ed8e9f71afc526e5cad339f245563450':
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Erin Dahlgren [Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)]
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 16:50:54 +0000 (09:50 -0700)]
Do not show any bottom controls in secure camera to prevent launching out of app behavior.
Bug:
11235651
Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
Erin Dahlgren [Tue, 15 Oct 2013 18:00:27 +0000 (11:00 -0700)]
am
487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
* commit '
487200db7f4d73e85ae568221d268b46fad19726':
Prevent crash after deleting album from Gallery by checking for more null pointers.
Erin Dahlgren [Tue, 15 Oct 2013 17:57:17 +0000 (17:57 +0000)]
Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
ztenghui [Tue, 15 Oct 2013 17:12:09 +0000 (10:12 -0700)]
am
0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
* commit '
0e6efbccdb196ef0847e00b23165ed94a77c9f3d':
NPE fix when we failed to open the camera
ztenghui [Tue, 15 Oct 2013 17:08:44 +0000 (17:08 +0000)]
Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
Erin Dahlgren [Tue, 15 Oct 2013 00:35:23 +0000 (17:35 -0700)]
Prevent crash after deleting album from Gallery by checking for more null pointers.
Bug:
10950130
Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
The Android Automerger [Tue, 15 Oct 2013 13:01:02 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Mangesh Ghiware [Tue, 15 Oct 2013 05:11:28 +0000 (22:11 -0700)]
am
4f4a1678: Fix Camera2 build.
* commit '
4f4a16782537f6eb08c5cc3ed76831312770e170':
Fix Camera2 build.
Mangesh Ghiware [Tue, 15 Oct 2013 05:05:16 +0000 (22:05 -0700)]
Fix Camera2 build.
Bug:
11226016
Change-Id: Ib667e52a150ffad44575ea97174f9d13de1d7b5e
Mangesh Ghiware [Tue, 15 Oct 2013 04:38:07 +0000 (21:38 -0700)]
am
2d939fe7: Use Gallery intents by default.
* commit '
2d939fe70e52ba4805c6783b01530c8c1c67fb33':
Use Gallery intents by default.
Mangesh Ghiware [Tue, 15 Oct 2013 04:19:22 +0000 (21:19 -0700)]
Use Gallery intents by default.
Bug:
11226016
Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
Sascha Haeberling [Tue, 15 Oct 2013 03:41:50 +0000 (20:41 -0700)]
am
d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
* commit '
d8b555b801c5e57bfbeca27ef38bea7688286c3c':
Updating shutter button resources
Sascha Haeberling [Tue, 15 Oct 2013 03:39:29 +0000 (03:39 +0000)]
Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 14 Oct 2013 23:45:19 +0000 (16:45 -0700)]
am
831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
* commit '
831da6132122d9d9a35183ef832994be659c3740':
Set camera controls visibility based on whether the camera preview is centered.
Baligh Uddin [Mon, 14 Oct 2013 23:42:37 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Erin Dahlgren [Mon, 14 Oct 2013 23:42:13 +0000 (23:42 +0000)]
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 22:25:16 +0000 (15:25 -0700)]
NPE fix when we failed to open the camera
At the same time, some error check code never get turned on.
Remove those stale codes and make sure we check the CameraDevice for null
correctly.
We didn't intensively log the error here since they should be logged by
the CameraOpenErrorCallback already.
bug:
11215576
Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
Baligh Uddin [Mon, 14 Oct 2013 23:21:39 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80c7902d8de92127a13f6d2f66452c876090a7ac
Auto-generated-cl: translation import
ztenghui [Mon, 14 Oct 2013 18:15:44 +0000 (11:15 -0700)]
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:
11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
Sascha Haeberling [Mon, 14 Oct 2013 22:06:29 +0000 (15:06 -0700)]
Updating shutter button resources
Bug:
11155984
Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
Igor Murashkin [Mon, 14 Oct 2013 21:57:30 +0000 (14:57 -0700)]
CameraUtil: add float clamp function
Bug:
10936156
Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
Sascha Haeberling [Mon, 14 Oct 2013 21:11:50 +0000 (14:11 -0700)]
am
2670f3e4: Updating button assets, follow-up to ag/373177
* commit '
2670f3e45f5818f7c1074b10ef336df30af74583':
Updating button assets, follow-up to http://ag/373177
Sascha Haeberling [Sun, 13 Oct 2013 16:10:02 +0000 (09:10 -0700)]
Updating button assets, follow-up to ag/373177
Bug:
11155984
Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
Doris Liu [Mon, 14 Oct 2013 20:50:30 +0000 (13:50 -0700)]
am
ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
* commit '
ce75de57dca5398b7786ad7262cb016e5f6b24ee':
Fix SRI upside down preview in reverse landscape and reverse portrait
Doris Liu [Mon, 14 Oct 2013 20:47:39 +0000 (20:47 +0000)]
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
Erin Dahlgren [Fri, 11 Oct 2013 01:23:45 +0000 (18:23 -0700)]
Set camera controls visibility based on whether the camera preview is centered.
Bug:
10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
ztenghui [Mon, 14 Oct 2013 20:39:10 +0000 (13:39 -0700)]
am
b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
* commit '
b27668f0d0a1d5049759a8448e1701e199e05c71':
Only delete the Uri coming from onMediaSaved
ztenghui [Mon, 14 Oct 2013 20:36:51 +0000 (20:36 +0000)]
Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
ztenghui [Mon, 14 Oct 2013 18:15:44 +0000 (11:15 -0700)]
Only delete the Uri coming from onMediaSaved
The incoming Uri can be null, or a file Uri, which we don't want to delete.
The Uri from onMediaSaved has been inserted to the MediaStore and pass null
check.
bug:
11218007
Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
Doris Liu [Mon, 14 Oct 2013 19:06:20 +0000 (12:06 -0700)]
Fix SRI upside down preview in reverse landscape and reverse portrait
Also make sure preview is not upside down after device flip, and
fix camera controls jiggering during rotation
Bug:
11216647
Bug:
11174540
Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
The Android Automerger [Mon, 14 Oct 2013 13:00:32 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Angus Kong [Mon, 14 Oct 2013 05:21:30 +0000 (22:21 -0700)]
am
ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
* commit '
ae1697302b4ef59bbfebdf1127bc73531ce550b7':
Ignore clicks on disabled pie menu items.
Angus Kong [Mon, 14 Oct 2013 05:19:37 +0000 (05:19 +0000)]
Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
Angus Kong [Mon, 14 Oct 2013 05:18:24 +0000 (22:18 -0700)]
am
24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
* commit '
24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19':
Workaround to prevent the data focus callback.
Angus Kong [Mon, 14 Oct 2013 05:16:34 +0000 (05:16 +0000)]
Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
Angus Kong [Mon, 14 Oct 2013 03:21:09 +0000 (20:21 -0700)]
Ignore clicks on disabled pie menu items.
bug:
11205671
Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
Angus Kong [Mon, 14 Oct 2013 02:26:02 +0000 (19:26 -0700)]
Workaround to prevent the data focus callback.
bug:
11205669
Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
The Android Automerger [Mon, 14 Oct 2013 02:20:36 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Mon, 14 Oct 2013 00:10:39 +0000 (17:10 -0700)]
am
28019abc: Change keyguard camera layout to show no menu options in indicator
* commit '
28019abc86de3d96a32595e69f6c549353b2c4ec':
Change keyguard camera layout to show no menu options in indicator
Alan Newberger [Mon, 14 Oct 2013 00:02:03 +0000 (17:02 -0700)]
Change keyguard camera layout to show no menu options in indicator
There are situations where the user selected options e.g. hdr+ are
the initial indicators to the camera, so showing autoflash on the
fake layout seems janky. additionally I sometimes see camera showing
its own default clean circle indicator layout prior to switching to
whatever indicators are active. For both these reasons it seems better
to start secure camera from lockscreen with an empty circle indicator.
I tried this CL out on my device and can confirm it feels less janky.
Bug:
11206325
Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
Sascha Haeberling [Sun, 13 Oct 2013 23:07:48 +0000 (16:07 -0700)]
am
704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
* commit '
704530edd94ba9b5990a247d4156ec18bf6ea0eb':
Add 'disabled' state for when Gcam is unable to take another shot.
Sascha Haeberling [Sun, 13 Oct 2013 23:06:10 +0000 (23:06 +0000)]
Merge "Add 'disabled' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
Doris Liu [Sun, 13 Oct 2013 22:31:12 +0000 (15:31 -0700)]
am
c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
* commit '
c937ab7f9bac633aa425da62348f9eb07c248450':
Fix for mis-placed camera controls
Doris Liu [Sun, 13 Oct 2013 22:29:41 +0000 (22:29 +0000)]
Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
Sascha Haeberling [Sun, 13 Oct 2013 20:29:46 +0000 (13:29 -0700)]
Add 'disabled' state for when Gcam is unable to take another shot.
Bug:
11113201
Change-Id: I887104dc79f4a7a83bb79b2d30c0289fc90c9022
Doris Liu [Sun, 13 Oct 2013 21:46:57 +0000 (14:46 -0700)]
Fix for mis-placed camera controls
Bug:
11205682
Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
Angus Kong [Sun, 13 Oct 2013 18:58:52 +0000 (11:58 -0700)]
am
2d5c7478: Don\'t load data when it\'s secure camera.
* commit '
2d5c74785d19f1944cab92948a6fa8233086ebc1':
Don't load data when it's secure camera.
The Android Automerger [Sun, 13 Oct 2013 13:02:18 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Angus Kong [Sun, 13 Oct 2013 06:48:46 +0000 (23:48 -0700)]
Don't load data when it's secure camera.
bug:
11063164
Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
Angus Kong [Sun, 13 Oct 2013 03:53:47 +0000 (20:53 -0700)]
am
f1582c9c: Adjust the position after layout change.
* commit '
f1582c9c075e9cd5790b4bbe1101c94a45ac15d2':
Adjust the position after layout change.
Angus Kong [Sun, 13 Oct 2013 01:52:33 +0000 (18:52 -0700)]
Adjust the position after layout change.
bug:
10993660
Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
Baligh Uddin [Sat, 12 Oct 2013 13:44:48 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 12 Oct 2013 08:46:16 +0000 (01:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4ff93327a41e4a0c3263e3fb32b510b19f60ab8c
Auto-generated-cl: translation import
Doris Liu [Sat, 12 Oct 2013 07:14:13 +0000 (00:14 -0700)]
am
a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
* commit '
a500241084f9e267e5f154b55e7a76a09623e6d8':
Correct initial orientation of camera controls
Doris Liu [Sat, 12 Oct 2013 07:12:04 +0000 (07:12 +0000)]
Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
Doris Liu [Sat, 12 Oct 2013 02:01:30 +0000 (19:01 -0700)]
Correct initial orientation of camera controls
Bug:
8878379
Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
ztenghui [Sat, 12 Oct 2013 00:41:31 +0000 (17:41 -0700)]
am
27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
* commit '
275625342769eba3e2b461e249aec83165e4e7f1':
Finish the secure camera activity when user try to play a video.
ztenghui [Sat, 12 Oct 2013 00:38:05 +0000 (00:38 +0000)]
Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
ztenghui [Sat, 12 Oct 2013 00:15:40 +0000 (17:15 -0700)]
Finish the secure camera activity when user try to play a video.
bug:
11190995
Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
Doris Liu [Sat, 12 Oct 2013 00:13:52 +0000 (17:13 -0700)]
am
87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
* commit '
87d093d6145524b1c8f5c052dfe40c18b52e5235':
Bring full screen window flag back to camera
Doris Liu [Sat, 12 Oct 2013 00:12:11 +0000 (00:12 +0000)]
Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
Doris Liu [Fri, 11 Oct 2013 23:54:51 +0000 (16:54 -0700)]
Bring full screen window flag back to camera
Bug:
11027091
Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
Seth Raphael [Fri, 11 Oct 2013 22:17:22 +0000 (15:17 -0700)]
am
3772d2f4: restore Usage Statistics
* commit '
3772d2f48ee5af8516f203f0f0519a2075042d6b':
restore Usage Statistics
Seth Raphael [Fri, 11 Oct 2013 21:27:59 +0000 (14:27 -0700)]
restore Usage Statistics
initialize was not being called anywhere.
Bug:
11188914
Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
Alan Newberger [Fri, 11 Oct 2013 20:32:30 +0000 (13:32 -0700)]
am
c13cc22b: Add strings to better describe HDR mode menus
* commit '
c13cc22ba17591111be3fae732ae0396e889820a':
Add strings to better describe HDR mode menus
Alan Newberger [Fri, 11 Oct 2013 20:20:59 +0000 (13:20 -0700)]
Add strings to better describe HDR mode menus
Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'.
Leaving existing strings to pipeline translations before implementing the migration to these strings.
Bug:
11185194
Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
Ruben Brunk [Fri, 11 Oct 2013 18:30:57 +0000 (11:30 -0700)]
am
f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
* commit '
f06221914bf40b6345cacd1a5904d773c6eddcb0':
gcam: Allow debugging postcapture image to be added to mediastore.
Ruben Brunk [Fri, 11 Oct 2013 18:29:02 +0000 (18:29 +0000)]
Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
Angus Kong [Thu, 10 Oct 2013 23:46:04 +0000 (16:46 -0700)]
Avoid unnecessary bringChildToFront() calls.
bug:
10750719
Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
Sameer Padala [Mon, 7 Oct 2013 20:09:34 +0000 (13:09 -0700)]
Fix build break.
ag/369626/ added a cannot_load_image string which was translated in ag/370960/
However, this translation resulted in a duplicate string since this string
already existed in translated versions of filtershow_strings.xml which was
deleted in ag/339346 but the translated versions weren't deleted. Deleting all
the translated versions of that file caused a problem because ag/362583/ added
source code that depended on a setting_wallpaper string which only existed in
the translated string files.
This change deletes the translated filtershow_strings.xml and adds the
untranslated setting_wallpaper string.
Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934
(cherry picked from commit
73a18da0f6181d882d04d648ddcbcc82047f5d71)
Baligh Uddin [Fri, 11 Oct 2013 16:32:24 +0000 (16:32 +0000)]
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev
Angus Kong [Fri, 11 Oct 2013 16:09:30 +0000 (09:09 -0700)]
am
81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
* commit '
81ef40bc4923e7014f52f03d8c7ddcf7a4344f70':
Avoid unnecessary bringChildToFront() calls.
Angus Kong [Fri, 11 Oct 2013 16:08:03 +0000 (16:08 +0000)]
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 11 Oct 2013 15:25:43 +0000 (15:25 +0000)]
Revert "Revert "Import translations. DO NOT MERGE""
This reverts commit
faa0615fd6d67fdfdbf28df099cb40a02c34c2f0.
Change-Id: I8043d94a45a975412c6f73e64628e1af3cc4d8fe
Baligh Uddin [Fri, 11 Oct 2013 15:25:02 +0000 (15:25 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
Baligh Uddin [Fri, 11 Oct 2013 15:24:53 +0000 (15:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
69e938dd6c3e49bfda29fc665b44340bf35b3e09.
Change-Id: I8a37595707a87b950c36a25003726d052ba2ab9d
Baligh Uddin [Fri, 11 Oct 2013 15:24:13 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 11 Oct 2013 08:59:03 +0000 (01:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib699ef5577f778618a8657f9f58d317def9268ab
Auto-generated-cl: translation import
OSDN Git Service
