OSDN Git Service
Baligh Uddin [Thu, 5 Nov 2015 21:13:05 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5495ee8a9b -s ours
am:
967f81f5d7 -s ours
* commit '
967f81f5d71312e0978ac72420a589a26f86e1ec':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:11:44 +0000 (21:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
57b7fa49ac -s ours
am:
335a6c58af -s ours
* commit '
335a6c58afed1ba18e2b2676ef98236d02f19648':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:10:28 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
6be193d87e -s ours
am:
251427a387 -s ours
* commit '
251427a38785144d80374c64fc0e020bf661e95f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 21:09:39 +0000 (21:09 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Baligh Uddin [Thu, 5 Nov 2015 21:09:12 +0000 (21:09 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
2fd15d5e8c
* commit '
2fd15d5e8c7dbefb49434670cc76a5b94899114c':
Baligh Uddin [Thu, 5 Nov 2015 21:08:07 +0000 (21:08 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
2fd15d5e8c
* commit '
2fd15d5e8c7dbefb49434670cc76a5b94899114c':
Baligh Uddin [Thu, 5 Nov 2015 21:06:51 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
8019f49d08 -s ours
am:
20abfb1089 -s ours
* commit '
20abfb108985de51b380bdfe9501bf304841f622':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 21:05:28 +0000 (21:05 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am:
c74dd7fcb1
am:
6ae3fe184c -s ours
* commit '
6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:07:28 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
e1348a7fa9 -s ours
am:
dd6d2fa5c7 -s ours
* commit '
dd6d2fa5c78bc86d56321244fb2ac33e9f86c761':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:06:07 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
2523c61fb7 -s ours
am:
8613602592 -s ours
* commit '
861360259234c33846d36ade8e90143d8c8eeecb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:05:07 +0000 (20:05 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Baligh Uddin [Thu, 5 Nov 2015 20:04:58 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
5495ee8a9b -s ours
* commit '
5495ee8a9bc44bb396a7bd2886d02ba7fe8ac711':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:04:40 +0000 (20:04 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
501a7521f0
* commit '
501a7521f04efc78337b43fba7493e68926dd372':
Baligh Uddin [Thu, 5 Nov 2015 20:03:32 +0000 (20:03 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
57b7fa49ac -s ours
* commit '
57b7fa49ace8d715c471a3dc9af943b654ca09a3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:03:32 +0000 (20:03 +0000)]
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am:
501a7521f0
* commit '
501a7521f04efc78337b43fba7493e68926dd372':
Baligh Uddin [Thu, 5 Nov 2015 20:02:15 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
cfd3d76b91 -s ours
am:
1c50ba0372 -s ours
* commit '
1c50ba0372cfcdbff38aaed29ec9b8e4b1b29143':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:02:12 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
6be193d87e -s ours
* commit '
6be193d87e4d7e1d517c9066bd8e4e7579384980':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:01:03 +0000 (20:01 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Baligh Uddin [Thu, 5 Nov 2015 20:01:02 +0000 (20:01 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Baligh Uddin [Thu, 5 Nov 2015 20:00:34 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8019f49d08 -s ours
* commit '
8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:00:26 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c138df954f -s ours
am:
22b41d07ff -s ours
* commit '
22b41d07ff7198f9c2bee4254c2f02a15128bd51':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:59:28 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c138df954f -s ours
am:
22b41d07ff -s ours
* commit '
22b41d07ff7198f9c2bee4254c2f02a15128bd51':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:59:19 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
8019f49d08 -s ours
* commit '
8019f49d0824b3027fcd8fa69d1bc9da64650d6f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:58:30 +0000 (19:58 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Baligh Uddin [Thu, 5 Nov 2015 19:58:02 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
aa4dbe2d84 -s ours
am:
010d1d1e15 -s ours
* commit '
010d1d1e15eb0cad401e15bec4f9f0dac72fb56e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:57:02 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
aa4dbe2d84 -s ours
am:
010d1d1e15 -s ours
* commit '
010d1d1e15eb0cad401e15bec4f9f0dac72fb56e':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 19:56:57 +0000 (19:56 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am:
c74dd7fcb1
* commit '
c74dd7fcb128e9a1465c1a91a91a851c3386a955':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:55:32 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
e1348a7fa9 -s ours
* commit '
e1348a7fa983099ccc387ee41ae1056571f33f51':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:54:53 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
70df552ac2 -s ours
am:
f61a22fe5d -s ours
* commit '
f61a22fe5d974ee568ac5b547a45e93f2b0cbcb2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:54:07 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
2523c61fb7 -s ours
* commit '
2523c61fb78e9f6022b9762750842a65bcb224f3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:53:32 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
31f0d18a03 -s ours
am:
cb60be1c2a -s ours
* commit '
cb60be1c2ab9ce4bd19250d544b2afb29a6e5f3d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:53:11 +0000 (19:53 +0000)]
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
Baligh Uddin [Thu, 5 Nov 2015 19:52:40 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
cfd3d76b91 -s ours
* commit '
cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:51:44 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
cfd3d76b91 -s ours
* commit '
cfd3d76b9149baabf31339546e178b45cd44ca80':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:50:16 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c138df954f -s ours
* commit '
c138df954f4ace40e722b9acbb2359d566da2147':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:49:27 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:23 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:19 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:49:17 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:48:50 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
aa4dbe2d84 -s ours
* commit '
aa4dbe2d84e4b92843496586ce70ba0eacaf51ae':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
70df552ac2 -s ours
* commit '
70df552ac2a2154bae5f1420bfd8bbaa4dc08811':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
31f0d18a03 -s ours
* commit '
31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
Import translations. DO NOT MERGE
Dan Albert [Thu, 5 Nov 2015 19:41:33 +0000 (19:41 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:40:59 +0000 (19:40 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
am:
22b7e496c2
* commit '
22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
Use std::unique_ptr instead of UniquePtr.
Baligh Uddin [Thu, 5 Nov 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:25 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:15 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:20 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:16 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:39:12 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Dan Albert [Thu, 5 Nov 2015 19:32:43 +0000 (19:32 +0000)]
Merge "Use std::unique_ptr instead of UniquePtr."
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Adam Lesinski [Thu, 5 Nov 2015 19:20:05 +0000 (19:20 +0000)]
Merge "AAPT2: Fix small issue with detecting translatable resources"
Chad Brubaker [Thu, 5 Nov 2015 19:05:47 +0000 (19:05 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720 am:
0bafbbfcb4
am:
b4b53b0741
* commit '
b4b53b0741b6ff75842d6630d5d1010c4efa766c':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:58:39 +0000 (18:58 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720
am:
0bafbbfcb4
* commit '
0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
Add initial network security config implementation
Adam Lesinski [Wed, 4 Nov 2015 21:51:45 +0000 (13:51 -0800)]
AAPT2: Fix small issue with detecting translatable resources
Change-Id: Idd21b5de4d20be06c6f8c8eb5a22ccd68afc4927
Brian Carlstrom [Thu, 5 Nov 2015 18:55:49 +0000 (18:55 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518 am:
671d5965f7
am:
f73e78fe1c
* commit '
f73e78fe1cb6803a29f7f85b49792f4e8a7350c8':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Brian Carlstrom [Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518
am:
671d5965f7
* commit '
671d5965f7b15ecba10453e8f445418dc0e730e6':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Dan Albert [Thu, 5 Nov 2015 18:33:51 +0000 (18:33 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6 am:
a41288b88f
am:
e0bcc4efe9
* commit '
e0bcc4efe96f196104e6de681b28de295d70fb84':
Don't apply clang flag to gcc builds.
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:28:19 +0000 (18:28 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6
am:
a41288b88f
* commit '
a41288b88f18273a61ed0af977408761598216cf':
Don't apply clang flag to gcc builds.
John Reck [Thu, 5 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "add DeviceInfo"
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Julia Reynolds [Thu, 5 Nov 2015 18:13:24 +0000 (18:13 +0000)]
Merge "Fix radio button flash on hour change."
John Reck [Thu, 5 Nov 2015 17:22:17 +0000 (09:22 -0800)]
add DeviceInfo
This reverts commit
096895550b9d5430d7a001d491566decf4f9791b.
Change-Id: Ib2ed1e96d8f7f88302f5e27fe735687194553104
Deepanshu Gupta [Thu, 5 Nov 2015 17:29:47 +0000 (17:29 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev am:
71093465ab
am:
ceb2b54909
* commit '
ceb2b549095b5f9a70baef6a0a847b453735f97a':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:24:38 +0000 (17:24 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
am:
71093465ab
* commit '
71093465abbdf887c705b40fb0cb8a2919894c4b':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:21:16 +0000 (17:21 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
Deepanshu Gupta [Thu, 5 Nov 2015 01:49:16 +0000 (17:49 -0800)]
Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
Filip Gruszczynski [Thu, 5 Nov 2015 17:00:18 +0000 (17:00 +0000)]
Merge "Animate the dock divider appearance/disappearance."
Filip Gruszczynski [Thu, 5 Nov 2015 00:10:54 +0000 (16:10 -0800)]
Animate the dock divider appearance/disappearance.
We want to animate the dock divider appearance only after the entrance
animation of the docked activity finishes, so these two don't clash. For
disappearance they will animate together.
Bug:
24913915
Change-Id: Ibe5c3960f21fcc5e64039b158605fa09017c5c34
Filip Gruszczynski [Thu, 5 Nov 2015 16:49:01 +0000 (16:49 +0000)]
Merge "Split code out from WMS.realyoutWindow."
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Svetoslav Ganov [Thu, 5 Nov 2015 15:50:28 +0000 (15:50 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c am:
0c7e9262a1
am:
f7db8e407b
* commit '
f7db8e407b02a3cb2fe1e1e5838b1ebcb67f6dc5':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 15:48:34 +0000 (15:48 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2 am:
a9b62e1330
am:
1809ccc62e
* commit '
1809ccc62e6c3649b3024a099dccccb3b773cf49':
Enforce weaker grant if app is default handler for miltiple action
Jason Monk [Wed, 4 Nov 2015 19:57:15 +0000 (14:57 -0500)]
Updates to Drawer
Support doing nothing on tvs and watches. Also better not doing
anything with no categories existing.
Change-Id: I4a12d4d907a08e75ed3cdcd3f7c68a3a100c687d
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Dan Albert [Thu, 5 Nov 2015 08:57:12 +0000 (00:57 -0800)]
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/
22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
Terry Heo [Thu, 5 Nov 2015 06:53:33 +0000 (15:53 +0900)]
CEC: Check validity of tvinput id
Bug:
25006096
Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
Tomasz Mikolajewski [Wed, 4 Nov 2015 09:24:09 +0000 (18:24 +0900)]
Implement efficient move on Internal Storage.
Bug:
24884813
Change-Id: I5a8dfeb13313a3e60ba2993643eb547adca7b851
Tomasz Mikolajewski [Thu, 5 Nov 2015 04:02:36 +0000 (04:02 +0000)]
Merge "Remove TRANSFER_MODE_NONE from CopyManager."
Chong Zhang [Thu, 5 Nov 2015 03:55:51 +0000 (03:55 +0000)]
Merge "fix missing dim layer surface"
Chong Zhang [Thu, 5 Nov 2015 02:36:00 +0000 (18:36 -0800)]
fix missing dim layer surface
bug:
24913379
Change-Id: Id3280ba9cccea57ca9cf0274cea589cd58e71a56
Tomasz Mikolajewski [Wed, 4 Nov 2015 06:33:20 +0000 (15:33 +0900)]
Remove TRANSFER_MODE_NONE from CopyManager.
This field is not necessary, as an operation is always either copy or move.
Change-Id: Ide68bb2bf5d237ed4c9abe8c443edd8e12dd82dd
Svetoslav Ganov [Thu, 5 Nov 2015 02:30:08 +0000 (02:30 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c
am:
0c7e9262a1
* commit '
0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:28:40 +0000 (02:28 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2
am:
a9b62e1330
* commit '
a9b62e13305d9cb43f53831f0b92d72bd490c1ae':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Tomasz Mikolajewski [Thu, 5 Nov 2015 02:25:23 +0000 (02:25 +0000)]
Merge "Wire copyDocument and moveDocument to CopyService."
Tomasz Mikolajewski [Wed, 4 Nov 2015 02:20:58 +0000 (11:20 +0900)]
Wire copyDocument and moveDocument to CopyService.
Bug:
24884665
Change-Id: Iaeac9ffa468150853f0f36c439f98df53937e519
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Filip Gruszczynski [Wed, 4 Nov 2015 02:05:47 +0000 (18:05 -0800)]
Split code out from WMS.realyoutWindow.
Change-Id: If57237013d87d864c219e5f6415de3d360cbbe75
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Felipe Leme [Thu, 5 Nov 2015 02:19:06 +0000 (02:19 +0000)]
Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG:
25455734"
OSDN Git Service
