OSDN Git Service
Bill Yi [Thu, 22 Sep 2016 13:10:34 +0000 (13:10 +0000)]
Import translations. DO NOT MERGE am:
7060296d02 -s ours
am:
3dc3d3eda4 -s ours
Change-Id: I355d68d5f7889543e4a51c633b7b06a5aa0192dc
Bill Yi [Thu, 22 Sep 2016 12:35:01 +0000 (12:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d5d5dc2473 -s ours
am:
7640ef24d1 -s ours
Change-Id: I6d733530f0fb6ab39ae4819e40cd5d5fbd47ff8e
Bill Yi [Thu, 22 Sep 2016 12:34:06 +0000 (12:34 +0000)]
Import translations. DO NOT MERGE am:
6394011a86 -s ours
am:
660e6d0269 -s ours
Change-Id: Idffe63458f7f0235e9ede96ab27fe4f61f30437b
Bill Yi [Thu, 22 Sep 2016 12:32:35 +0000 (12:32 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
5086fe2800 -s ours
Change-Id: I891dc2d4f99ac46f225837b9a71013ad8ff142c7
Bill Yi [Thu, 22 Sep 2016 12:32:27 +0000 (12:32 +0000)]
Import translations. DO NOT MERGE
am:
7fea90bfec -s ours
Change-Id: I312c228c256b9f71174e6c02af8a7c1dfceaae97
Bill Yi [Thu, 22 Sep 2016 12:30:03 +0000 (12:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c051914a46 -s ours
Change-Id: Id2bfbe894e47451efc8159a8cd692537d4f291f5
Bill Yi [Thu, 22 Sep 2016 12:29:57 +0000 (12:29 +0000)]
Import translations. DO NOT MERGE
am:
e0e30f5320 -s ours
Change-Id: If1a43ad1feb011755cf61f6c38a37b6c37ce56c8
Bill Yi [Thu, 22 Sep 2016 12:29:51 +0000 (12:29 +0000)]
Import translations. DO NOT MERGE
am:
7060296d02 -s ours
Change-Id: Iece9d5abf1ddb194f6009640ad6626609a8d769e
Elliot Waite [Thu, 22 Sep 2016 10:32:13 +0000 (10:32 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244 am:
8ea167bf7a am:
ffb31e9954
am:
99e8284514
Change-Id: I3cafba5a53c0a94b0569bbed1652f1fa61e69c88
Elliot Waite [Thu, 22 Sep 2016 10:31:18 +0000 (10:31 +0000)]
Revert fixed at links. am:
7c70fed347 am:
4a60ffd518 am:
e2b498241a
am:
47b11423ac
Change-Id: Ibae53d75c5f9ad8e0ee3e69688fbbe74448cdc22
Adarsh Fernando [Thu, 22 Sep 2016 10:30:08 +0000 (10:30 +0000)]
Found a couple of more references to Android N. am:
9af57aa309 am:
9a91d6662e am:
acb068a213
am:
9fc1b4c5b8
Change-Id: I0704581c446b52a1a75cea63e9e6b4a191d554e7
Adarsh Fernando [Thu, 22 Sep 2016 10:29:18 +0000 (10:29 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37 am:
453160c39d am:
551d5d7f7f
am:
a7de0e1f58
Change-Id: Ied8793e814a3eaf31da62ba78f18c339347a0b45
Adarsh Fernando [Thu, 22 Sep 2016 10:28:18 +0000 (10:28 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321 am:
0b8e646225 am:
059c09784d
am:
4fb36b0dfb
Change-Id: I1d65d529a99f23b01c1ec1533cddc800d3647d75
Stuart Scott [Thu, 22 Sep 2016 10:27:00 +0000 (10:27 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev am:
cffe1f48d3 am:
a676b157fb
am:
a177302cd0
Change-Id: I4ee26f9df77081d8d0ac989810b818775660cf62
Stuart Scott [Thu, 22 Sep 2016 10:26:02 +0000 (10:26 +0000)]
Continue if package is not in system am:
434c8db80f am:
0845b025aa
am:
b15c45a037
Change-Id: I8426be2a7217eb6eaf78f3e37fd787c065027411
Jaewan Kim [Thu, 22 Sep 2016 10:25:08 +0000 (10:25 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592 am:
60d2af330b am:
345d75bf88
am:
1f52dcc543
Change-Id: I6ffcfa8151c1430546d6f30348a7029e06e20549
Jaewan Kim [Thu, 22 Sep 2016 10:23:03 +0000 (10:23 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b am:
01796f794d am:
e13dc68953
am:
407e4eaa34
Change-Id: I49c03f2164bc01f73244858239ab9916617be48c
Bill Yi [Thu, 22 Sep 2016 10:22:21 +0000 (10:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d5d5dc2473 -s ours
Change-Id: Ie1fd61e17f3ed2a1429412722f1571e5c1e91954
Bill Yi [Thu, 22 Sep 2016 10:22:17 +0000 (10:22 +0000)]
Import translations. DO NOT MERGE
am:
6394011a86 -s ours
Change-Id: I5b6ba4829095eed2641781e45468a1f7a009ec85
TreeHugger Robot [Thu, 22 Sep 2016 09:56:52 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:56:31 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 22 Sep 2016 09:51:57 +0000 (09:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Elliot Waite [Thu, 22 Sep 2016 09:14:10 +0000 (09:14 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244 am:
8ea167bf7a
am:
ffb31e9954
Change-Id: I6e4932469886f810162460c5de855c46d2f2fb2b
Elliot Waite [Thu, 22 Sep 2016 09:13:23 +0000 (09:13 +0000)]
Revert fixed at links. am:
7c70fed347 am:
4a60ffd518
am:
e2b498241a
Change-Id: I0f40cd7bdc31dcf0f3865f3ff70a9e8012aedfbc
Adarsh Fernando [Thu, 22 Sep 2016 09:12:28 +0000 (09:12 +0000)]
Found a couple of more references to Android N. am:
9af57aa309 am:
9a91d6662e
am:
acb068a213
Change-Id: I008c015bfb6c934edb55a6ece40ba3237945f66b
Adarsh Fernando [Thu, 22 Sep 2016 08:05:56 +0000 (08:05 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37 am:
453160c39d
am:
551d5d7f7f
Change-Id: I1b4ae3746ec944b013cafb4635d023016d656ce3
Adarsh Fernando [Thu, 22 Sep 2016 08:04:57 +0000 (08:04 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321 am:
0b8e646225
am:
059c09784d
Change-Id: Ice0f6182bf2db6c8d62fc592f65834d4d9adb794
Stuart Scott [Thu, 22 Sep 2016 08:03:52 +0000 (08:03 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev am:
cffe1f48d3
am:
a676b157fb
Change-Id: Ib06a5e2be884bac724b3d29d327acd8b0533978a
Stuart Scott [Thu, 22 Sep 2016 08:03:03 +0000 (08:03 +0000)]
Continue if package is not in system am:
434c8db80f
am:
0845b025aa
Change-Id: Id87f7ab2c549d176d82fbcf18479671320a74616
Jaewan Kim [Thu, 22 Sep 2016 08:02:10 +0000 (08:02 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592 am:
60d2af330b
am:
345d75bf88
Change-Id: I38af1702ae0d2766ef15192eb53b35d88849bbf1
Jaewan Kim [Thu, 22 Sep 2016 08:01:22 +0000 (08:01 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b am:
01796f794d
am:
e13dc68953
Change-Id: I525e467ab112abfcd8bf9ef3e6cdc6b4b3f2f78f
Jaewan Kim [Thu, 22 Sep 2016 07:37:03 +0000 (07:37 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592
am:
bb4697b2f5
Change-Id: Ib20f38f881707a35f27b8b7cdf36b4559fa18e88
Jaewan Kim [Thu, 22 Sep 2016 07:36:11 +0000 (07:36 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b
am:
f6272e1fd5
Change-Id: I8125f4a9f684293e247bae07b5da60e79c7a674a
Greg Hackmann [Thu, 22 Sep 2016 07:34:22 +0000 (07:34 +0000)]
Merge changes Iaa153fca,I619e2d8a am:
59acc059a6 am:
4a62720f47
am:
cd5087a5d0
Change-Id: I720a51eeef2a883a4fbded24b95d3617032c3da5
Greg Hackmann [Thu, 22 Sep 2016 07:32:22 +0000 (07:32 +0000)]
AlarmManagerService: explain some timerfd_create() failures am:
a0126e0857 am:
dd4f59a76f
am:
b79eb2540a
Change-Id: Idcedef52ac3614627bdfe67d5bcccc07434f865b
Greg Hackmann [Thu, 22 Sep 2016 07:30:37 +0000 (07:30 +0000)]
AlarmManagerService: remove legacy /dev/alarm support am:
d7151c06f1 am:
ccafcac745
am:
d869532332
Change-Id: I62785aa1b833108f7ee69e16ac8c6ad4d4a74d4e
Elliot Waite [Thu, 22 Sep 2016 06:46:29 +0000 (06:46 +0000)]
Merge "Revert fixed at links." into nyc-dev am:
c77b72f244
am:
8ea167bf7a
Change-Id: I340bb9df7c736f1c4f22c53cf8919d36f024c32e
Elliot Waite [Thu, 22 Sep 2016 06:45:29 +0000 (06:45 +0000)]
Revert fixed at links. am:
7c70fed347
am:
4a60ffd518
Change-Id: I24d872329e40cea924da713ec3c4f869ab012824
Adarsh Fernando [Thu, 22 Sep 2016 06:44:43 +0000 (06:44 +0000)]
Found a couple of more references to Android N. am:
9af57aa309
am:
9a91d6662e
Change-Id: I82ea73e071445ca4d07602fa54ba1f03f57635b3
Adarsh Fernando [Thu, 22 Sep 2016 06:43:57 +0000 (06:43 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am:
fe060d3f37
am:
453160c39d
Change-Id: I5ca41ea38bfc46ed81d9319f7ce20da7e6399e0d
Adarsh Fernando [Thu, 22 Sep 2016 06:43:14 +0000 (06:43 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs. am:
4b6d939321
am:
0b8e646225
Change-Id: If303eafb66a971de300758af21a5a830084d0aff
Stuart Scott [Thu, 22 Sep 2016 06:41:55 +0000 (06:41 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
am:
cffe1f48d3
Change-Id: I490c87e5e70059406d3088b3ab8537bd6e42b38c
Stuart Scott [Thu, 22 Sep 2016 06:41:52 +0000 (06:41 +0000)]
Continue if package is not in system
am:
434c8db80f
Change-Id: Ie2a9741583bb09ddcb27e28e18f29d63f371c8ff
Jaewan Kim [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev am:
8ba2549592
am:
60d2af330b
Change-Id: I1a234ee41fc85cbe954990d13b5de123efe9afc8
Jaewan Kim [Thu, 22 Sep 2016 06:40:10 +0000 (06:40 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
09c3df004b
am:
01796f794d
Change-Id: Ifdeb43d20983d31713defaae3d7e0075a11cb562
Bill Yi [Thu, 22 Sep 2016 06:05:36 +0000 (23:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib207a07629651b14f450065e8314b2d8b3252c35
Auto-generated-cl: translation import
Adam Lesinski [Thu, 22 Sep 2016 05:41:37 +0000 (05:41 +0000)]
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev am:
8dcd08ed04
am:
de3ac160b0
Change-Id: Ibb0745f64337abfe1dcfd23fdc7186de5cbe121d
Adam Lesinski [Thu, 22 Sep 2016 05:40:44 +0000 (05:40 +0000)]
AAPT: Don't imply specific location hardware for dump badging am:
43158773b4
am:
7f56759cfd
Change-Id: Id54d729793267634f1ade9073395ed6d6921ce60
Bill Yi [Thu, 22 Sep 2016 05:35:25 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I55e1719cddf0d684ff7b5c89f11a1d0c6bb49a97
Auto-generated-cl: translation import
Andrii Kulian [Thu, 22 Sep 2016 05:03:18 +0000 (05:03 +0000)]
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev am:
3904e1bc34
am:
ae53cef574
Change-Id: Ie607e0cabdecd5b3b44220e2074b4007a22c19c8
Andrii Kulian [Thu, 22 Sep 2016 05:02:23 +0000 (05:02 +0000)]
Fix stopping activity when removed from waiting visible am:
ee05681139
am:
273acdcefa
Change-Id: I451b830e704d39dee1089d28bde2625cd150d8dc
Adam Powell [Thu, 22 Sep 2016 05:01:34 +0000 (05:01 +0000)]
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev am:
33c9713bdd
am:
4a8e154109
Change-Id: I30f1da93b390d94cc2af1df5457dd68678507e70
Adam Powell [Thu, 22 Sep 2016 05:00:40 +0000 (05:00 +0000)]
Don't hold old host callback for fragments on the back stack am:
180202f221
am:
5254ef7bd3
Change-Id: I067c4fc441b34a7f9edfdbfee0995e91054fb890
Jeff Sharkey [Thu, 22 Sep 2016 04:59:30 +0000 (04:59 +0000)]
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev am:
b90ae85acc
am:
21c246b726
Change-Id: Ife896935e35c2a1d502dc46cea2849aaa30512fd
Jeff Sharkey [Thu, 22 Sep 2016 04:58:43 +0000 (04:58 +0000)]
Rename should behave like create: avoid conflict. am:
2c89a4c170
am:
0e033491ca
Change-Id: I071e31e47dd662d5a7816bc1c3326fe964a6daf8
Edward Savage-Jones [Thu, 22 Sep 2016 04:57:57 +0000 (04:57 +0000)]
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev am:
7baf677ded
am:
37298f15a9
Change-Id: Ia3ef7a19427474ffa68ee20378d4ce9ce34a2c05
Edward Savage-Jones [Thu, 22 Sep 2016 04:57:05 +0000 (04:57 +0000)]
Fix WallpaperManager APIs am:
6009d9db88
am:
50fe2c4847
Change-Id: I438f6bd5877070fbb8e798403e5feb64b9ee1829
Selim Cinek [Thu, 22 Sep 2016 04:56:14 +0000 (04:56 +0000)]
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev am:
4c1c7f3e18
am:
cbd3c73f6e
Change-Id: I6c6fd78b756f4835e14e657457ca264900b3862a
Adam Lesinski [Thu, 22 Sep 2016 04:55:17 +0000 (04:55 +0000)]
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
am:
8dcd08ed04
Change-Id: I78f9e151ec1705b65f6ed512973c63dcd826fec2
Selim Cinek [Thu, 22 Sep 2016 04:55:17 +0000 (04:55 +0000)]
Large icons now scale nicer when expanding bundles am:
8a71ad032f
am:
d4b03c47b5
Change-Id: I1cd46ab1fe38ed7b85b94101360475e9247f2d31
Adam Lesinski [Thu, 22 Sep 2016 04:55:13 +0000 (04:55 +0000)]
AAPT: Don't imply specific location hardware for dump badging
am:
43158773b4
Change-Id: Ie34566a33dfbaf92f4a47f36be6786157d504066
Andrii Kulian [Thu, 22 Sep 2016 03:54:13 +0000 (03:54 +0000)]
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
am:
3904e1bc34
Change-Id: I3de16803747f58fba71d6e33ea934eb309d2310b
Andrii Kulian [Thu, 22 Sep 2016 03:54:10 +0000 (03:54 +0000)]
Fix stopping activity when removed from waiting visible
am:
ee05681139
Change-Id: Iefa95af94e488fbd33c567e268ab7fb7a1e09f51
Adam Powell [Thu, 22 Sep 2016 03:52:39 +0000 (03:52 +0000)]
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
am:
33c9713bdd
Change-Id: I5b567de888a3f0ff359a1cbe7664dcced217fa62
Adam Powell [Thu, 22 Sep 2016 03:52:35 +0000 (03:52 +0000)]
Don't hold old host callback for fragments on the back stack
am:
180202f221
Change-Id: I7f2c4c8d340b1b54d3e9ded5819e19fa3e4bc83e
Jeff Sharkey [Thu, 22 Sep 2016 03:51:22 +0000 (03:51 +0000)]
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
am:
b90ae85acc
Change-Id: I7d6c0180ddcd9224a7e738351c7c7854f6c5068d
Jeff Sharkey [Thu, 22 Sep 2016 03:51:19 +0000 (03:51 +0000)]
Rename should behave like create: avoid conflict.
am:
2c89a4c170
Change-Id: I8d288a8afd06bc46d8d3051ce025c0af6c9875fa
Edward Savage-Jones [Thu, 22 Sep 2016 03:50:15 +0000 (03:50 +0000)]
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
am:
7baf677ded
Change-Id: I0bfa8d50d88b09316c6efe8d8db16686ce0d300d
Edward Savage-Jones [Thu, 22 Sep 2016 03:50:04 +0000 (03:50 +0000)]
Fix WallpaperManager APIs
am:
6009d9db88
Change-Id: I82de1e6403306f0984d15db8448546aebf7ec107
Elliot Waite [Thu, 22 Sep 2016 03:49:12 +0000 (03:49 +0000)]
Merge "Revert fixed at links." into nyc-dev
am:
c77b72f244
Change-Id: I2ee03bed08613ad562cd62fdae1c1bc526c10be4
Elliot Waite [Thu, 22 Sep 2016 03:49:08 +0000 (03:49 +0000)]
Revert fixed at links.
am:
7c70fed347
Change-Id: I69a15936193917911224af7f417b16d30dd8dfe4
Selim Cinek [Thu, 22 Sep 2016 03:48:38 +0000 (03:48 +0000)]
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
am:
4c1c7f3e18
Change-Id: I74fe8ee556cf39459e61876dccab10140e3afe04
Selim Cinek [Thu, 22 Sep 2016 03:48:34 +0000 (03:48 +0000)]
Large icons now scale nicer when expanding bundles
am:
8a71ad032f
Change-Id: I391f56cca21177179ea033d7be08f649e7b61664
Adarsh Fernando [Thu, 22 Sep 2016 03:48:21 +0000 (03:48 +0000)]
Found a couple of more references to Android N.
am:
9af57aa309
Change-Id: I2a72b761fdb8fddbda7aca792a08c851595b29ac
Adarsh Fernando [Thu, 22 Sep 2016 03:47:02 +0000 (03:47 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am:
fe060d3f37
Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833
Adarsh Fernando [Thu, 22 Sep 2016 03:46:55 +0000 (03:46 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs.
am:
4b6d939321
Change-Id: Ife2fba8fa61083ccaf2c3f4a3df88418bd0a316b
Ben Lin [Thu, 22 Sep 2016 02:54:23 +0000 (02:54 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am:
ba0ee69a15 -s ours
am:
5340d7d849 -s ours
Change-Id: I653293d3e43fff57b4ddd651d01b10e46be6160c
Ben Lin [Thu, 22 Sep 2016 02:53:21 +0000 (02:53 +0000)]
DO NOT MERGE ANYWHERE am:
5e1e779098 -s ours
am:
d979b4e187 -s ours
Change-Id: Iaef7d9494b81c77abb11b2fc93e944bcd10172d5
TreeHugger Robot [Thu, 22 Sep 2016 02:32:55 +0000 (02:32 +0000)]
Merge "AAPT: Don't imply specific location hardware for dump badging" into nyc-mr1-dev
Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]
Merge "Revert fixed at links." into nyc-dev
TreeHugger Robot [Thu, 22 Sep 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev
Amith Yamasani [Thu, 22 Sep 2016 01:38:17 +0000 (01:38 +0000)]
Merge "Don't inform usage stats of interaction for a toast" into nyc-mr1-dev am:
be2db1ef72
am:
349a5ba1dc
Change-Id: I38817a0d71f679bcdb4d54f82840d0fcb3eb04a3
Amith Yamasani [Thu, 22 Sep 2016 01:36:21 +0000 (01:36 +0000)]
Don't inform usage stats of interaction for a toast am:
43caafa2b6
am:
0775c2e29a
Change-Id: I3ee09b516288baca8eab2fb88ea905f91c042610
Adam Lesinski [Wed, 11 Nov 2015 23:13:55 +0000 (15:13 -0800)]
AAPT: Don't imply specific location hardware for dump badging
Permissions such as android.permission.ACCESS_FINE_LOCATION
and android.permission.ACCESS_COARSE_LOCATION assumed the underlying feature
technology and aapt dump badging would emit an implied feature.
This is no longer accurate, so the only implied feature is on the general
android.hardware.location when the target SDK of the app is 21+.
Bug:
25218770
Change-Id: Ica9ebf7d4f360b137af54a8c8fd6c0358cd9be6a
TreeHugger Robot [Thu, 22 Sep 2016 00:49:58 +0000 (00:49 +0000)]
Merge "Don't hold old host callback for fragments on the back stack" into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 00:49:05 +0000 (00:49 +0000)]
Merge "Rename should behave like create: avoid conflict." into nyc-mr1-dev
TreeHugger Robot [Thu, 22 Sep 2016 00:35:10 +0000 (00:35 +0000)]
Merge "Fix WallpaperManager APIs" into nyc-mr1-dev
Andrii Kulian [Wed, 21 Sep 2016 22:34:45 +0000 (15:34 -0700)]
Fix stopping activity when removed from waiting visible
During refactoring in ag/613666 waitingVisible flag clearing
was mistakenly removed. It was added back in ag/
1221328 but
only for activities that are finishing.
This caused activity not being stopped in some cases when
window visibility change was handled before receiving idle
callback from client. This is easily reproducible when there
is a scene transition animation specified.
Bug:
31078584
Change-Id: Ic09c5199ad4fceae0607e4bcce02be5335c8870b
Bill Yi [Thu, 22 Sep 2016 00:14:49 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibe04ecdfb022f2fdb5d5d918c823951323a00439
Auto-generated-cl: translation import
Bill Yi [Thu, 22 Sep 2016 00:08:47 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: If35faadb6cd94b0cd490a5db7310371208fe3674
Auto-generated-cl: translation import
Selim Cinek [Wed, 21 Sep 2016 23:51:02 +0000 (23:51 +0000)]
Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev
Ben Lin [Wed, 21 Sep 2016 23:42:11 +0000 (23:42 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
am:
ba0ee69a15 -s ours
Change-Id: I9fbfd898747aa183b91df605d85d91c797992ba3
Ben Lin [Wed, 21 Sep 2016 23:42:08 +0000 (23:42 +0000)]
DO NOT MERGE ANYWHERE
am:
5e1e779098 -s ours
Change-Id: I3a51fc93e7b754d7a5697ba2ef19c38b9af0e42c
Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]
Revert fixed at links.
This reverts commit
c4ae7827e26ab3d0ac340d896c28c166da860fdb.
Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
Jeff Sharkey [Wed, 21 Sep 2016 00:54:46 +0000 (18:54 -0600)]
Rename should behave like create: avoid conflict.
When we create a file that already exists, we try attaching a suffix
like "(1)" to the filename to avoid the conflict. The newly added
rename method should do the same, since developers may not have
access to delete the conflicting file.
Test: boots, rename via UI, new unit tests
Bug:
31545404
Change-Id: Ie397eebb0fbf98cf079eee3bbbb6c6b7ca627d91
Stuart Scott [Wed, 21 Sep 2016 22:58:53 +0000 (22:58 +0000)]
Merge "Continue if package is not in system" into nyc-dr1-dev
Jaewan Kim [Wed, 21 Sep 2016 22:54:59 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am:
8ba2549592
Change-Id: Ife59e9c42d4c6f5632429764c30fa62b803a97fc
Jaewan Kim [Wed, 21 Sep 2016 22:54:50 +0000 (22:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
09c3df004b
Change-Id: If41cb6895220d09267fac3e44348e0a4a330ec16
Jaewan Kim [Wed, 21 Sep 2016 22:54:04 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am:
8ba2549592
Change-Id: I5593d4149bbd8235d42a0cb2b23c9fb091aa70f9
Jaewan Kim [Wed, 21 Sep 2016 22:53:59 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
09c3df004b
Change-Id: Ib883850c8554fae35e29313e2ea6a19e3592148c
OSDN Git Service
