OSDN Git Service
Robert Greenwalt [Thu, 4 Sep 2014 21:16:51 +0000 (21:16 +0000)]
am
ca6b015f: Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev
* commit '
ca6b015f26c1b8f6d701677961b0b48c21ab7c36':
Catch creation of NetworkRequest without NetCap
Chris Craik [Thu, 4 Sep 2014 21:16:46 +0000 (21:16 +0000)]
am
b25a4d5f: Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev
* commit '
b25a4d5fbbbbcaefd0c494c410542680db9c7d11':
Prioritize reveal clipping over Outline clipping
David Christie [Thu, 4 Sep 2014 21:08:19 +0000 (21:08 +0000)]
am
36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug:
17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev
* commit '
36b0eac472fdbc45db378646170b891581b53b36':
Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug:
17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
RoboErik [Thu, 4 Sep 2014 21:08:14 +0000 (21:08 +0000)]
am
9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev
* commit '
9c7c737a603807e727721d00b70a227f60c674e1':
Ensure there's a valid handler when registering a sessions listener
Robert Greenwalt [Thu, 4 Sep 2014 21:08:09 +0000 (21:08 +0000)]
Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev
Eric Laurent [Thu, 4 Sep 2014 21:08:08 +0000 (21:08 +0000)]
am
f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev
* commit '
f225a5c2410eb7a9417f02e65afbe0f92a338a25':
AudioManager: only use main looper for AudioPort event handler
Alan Viverette [Thu, 4 Sep 2014 21:08:04 +0000 (21:08 +0000)]
am
69dc952d: Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev
* commit '
69dc952dba40c2c5ab3f0e596391e330ff9f71c8':
Fix AM/PM text i18n and clean up keyboard support in time picker
Alan Viverette [Thu, 4 Sep 2014 21:07:59 +0000 (21:07 +0000)]
am
cfad03e3: Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev
* commit '
cfad03e3088ea3f673859c1ada257f299b4ebe68':
Fix clip rect when drawing accessibility focus rect
Craig Mautner [Thu, 4 Sep 2014 21:07:54 +0000 (21:07 +0000)]
am
ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev
* commit '
ac8731f94bb416be0cc54f226bda1929b0cba2c0':
Eliminate deadlock by deferring wipe data call
Raph Levien [Thu, 4 Sep 2014 21:07:49 +0000 (21:07 +0000)]
am
58e457cc: Merge "Fix Layout.isRtlCharAt" into lmp-dev
* commit '
58e457ccaf9d9b864d4033be18ddf0e71a218952':
Fix Layout.isRtlCharAt
Alan Viverette [Thu, 4 Sep 2014 21:07:42 +0000 (21:07 +0000)]
am
3d6f0211: Merge "Clear ripple animations on cancel/end" into lmp-dev
* commit '
3d6f02118c08b45e1b9a4b9a28ca494db4bf5e3e':
Clear ripple animations on cancel/end
Chris Craik [Thu, 4 Sep 2014 21:06:09 +0000 (21:06 +0000)]
Merge "Prioritize reveal clipping over Outline clipping" into lmp-dev
Chris Craik [Thu, 4 Sep 2014 00:52:24 +0000 (17:52 -0700)]
Prioritize reveal clipping over Outline clipping
bug:
15780987
bug:
17350602
Also update docs around clipping nesting behavior,
and some Z ordering behavior.
Change-Id: Iaa204350a0adfdcbd8c4b821fb4a9c0ae22f2613
David Christie [Thu, 4 Sep 2014 20:53:38 +0000 (20:53 +0000)]
Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug:
17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev
David Christie [Thu, 4 Sep 2014 18:29:01 +0000 (11:29 -0700)]
Add @SystemApi annotations to methods used by GmsCore.
-Currently these methods are called using reflection for location.
Bug:
17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
RoboErik [Thu, 4 Sep 2014 20:52:55 +0000 (20:52 +0000)]
Merge "Ensure there's a valid handler when registering a sessions listener" into lmp-dev
Eric Laurent [Thu, 4 Sep 2014 20:47:43 +0000 (20:47 +0000)]
Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev
Alan Viverette [Thu, 4 Sep 2014 20:45:04 +0000 (20:45 +0000)]
Merge "Fix AM/PM text i18n and clean up keyboard support in time picker" into lmp-dev
Alan Viverette [Thu, 4 Sep 2014 20:44:37 +0000 (20:44 +0000)]
Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev
Prabhakar Thirumoorthy [Thu, 4 Sep 2014 20:42:14 +0000 (20:42 +0000)]
am
bbc5508d: Merge "Add a missing dependency on a shared JNI library" into lmp-dev
* commit '
bbc5508df13852f2e95bedaedc3fba9b202f9a67':
Add a missing dependency on a shared JNI library
Adam Lesinski [Thu, 4 Sep 2014 20:42:09 +0000 (20:42 +0000)]
am
0c0fcce6: Merge "Add Configuration changes to UsageStats" into lmp-dev
* commit '
0c0fcce6a5ce39df0161a78fbb0577d4c70a7a87':
Add Configuration changes to UsageStats
Jing Zhao [Thu, 4 Sep 2014 20:42:04 +0000 (20:42 +0000)]
am
2c8b3f19: AT&T short dialing code
* commit '
2c8b3f19d4a2e575a769d6d9ff2ea16947cd22ce':
AT&T short dialing code
Craig Mautner [Thu, 4 Sep 2014 20:41:38 +0000 (20:41 +0000)]
Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev
Raph Levien [Thu, 4 Sep 2014 20:40:43 +0000 (20:40 +0000)]
Merge "Fix Layout.isRtlCharAt" into lmp-dev
Alan Viverette [Thu, 4 Sep 2014 20:40:05 +0000 (20:40 +0000)]
Merge "Clear ripple animations on cancel/end" into lmp-dev
Prabhakar Thirumoorthy [Thu, 4 Sep 2014 20:38:08 +0000 (20:38 +0000)]
Merge "Add a missing dependency on a shared JNI library" into lmp-dev
Adam Lesinski [Thu, 4 Sep 2014 20:35:49 +0000 (20:35 +0000)]
Merge "Add Configuration changes to UsageStats" into lmp-dev
Jing Zhao [Fri, 29 Aug 2014 21:22:44 +0000 (16:22 -0500)]
AT&T short dialing code
User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.
Bug:
17314389
Change-Id: I2f4187ddcbad6d78ee8d8c1881648b96a9da76dd
Alan Viverette [Thu, 4 Sep 2014 20:09:34 +0000 (13:09 -0700)]
Fix clip rect when drawing accessibility focus rect
BUG:
17320910
Change-Id: I4112c2c9c10187d4b085c7eb96112fab090612ce
Jason Monk [Thu, 4 Sep 2014 20:02:00 +0000 (20:02 +0000)]
am
f06881a4: Merge "Proxy fixes from API review feedback" into lmp-dev
* commit '
f06881a4755f146efcc2abca83f48580f16f794f':
Proxy fixes from API review feedback
Deepanshu Gupta [Thu, 4 Sep 2014 20:01:55 +0000 (20:01 +0000)]
am
1de3eb07: am
4576f597: am
9bfa0736: am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes prop
* commit '
1de3eb0784033545b2fac98c43e317e70933e3c5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 20:01:51 +0000 (20:01 +0000)]
am
1e1e8b58: am
0d5a7d7f: am
8929642c: am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib
* commit '
1e1e8b5804d0c808ee3ea5a02009a2b1e240d02b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 20:01:46 +0000 (20:01 +0000)]
am
a02e2cd8: am
b0be9926: (-s ours) am
889ec192: am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
a02e2cd8baa7204da99ee828a130c92a0a5b283f':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 20:01:41 +0000 (20:01 +0000)]
am
54f5b95f: am
2be81615: (-s ours) am
9f7c594a: am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
54f5b95f4d66ea84923ab69e041528ce6ab49f41':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 20:01:37 +0000 (20:01 +0000)]
am
b031a32c: am
7632ed91: am
525e552e: am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
b031a32c65f97aaae35f3ee00b8ed537ac322563':
Do not restore the media button event receiver
Craig Mautner [Thu, 4 Sep 2014 19:56:39 +0000 (12:56 -0700)]
Eliminate deadlock by deferring wipe data call
The call to RecoverySystem.rebootWipeUserData() was made while
holding the lock to DevicePolicyManagerService. But it blocks
waiting for system_process' main thread to receive the ordered
broadcast complete callback. It won't receive that callback
because Keyguard is running on the main thread and is concurrently
blocked on DevicePolicyManagerService.
By moving the call to rebootWipeUserData() out of the synchronized
block the deadlock is eliminated.
Fixes bug
16870054.
Change-Id: I3eb587211e5484859cc9dab7e80e5a1f6c85225d
Jason Monk [Thu, 4 Sep 2014 19:52:02 +0000 (19:52 +0000)]
Merge "Proxy fixes from API review feedback" into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 19:49:26 +0000 (19:49 +0000)]
am
4576f597: am
9bfa0736: am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT
* commit '
4576f597078ade77c38a6432d8ae4edc85446db5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 19:49:22 +0000 (19:49 +0000)]
am
0d5a7d7f: am
8929642c: am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MER
* commit '
0d5a7d7f41c0c7bd920fda0e7d4780dc639c90f1':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 19:49:17 +0000 (19:49 +0000)]
am
b0be9926: (-s ours) am
889ec192: am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
b0be99261ae96df7c29856eccc571e54247fa3a5':
Resolve color xml attributes properly. [DO NOT MERGE]
Ye Wen [Thu, 4 Sep 2014 19:49:15 +0000 (19:49 +0000)]
am
f9723425: Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev
* commit '
f9723425d6fca88a51a42b50a073246563d78668':
Add missing mms_config key enableGroupMms to SmsManager (1/2)
Deepanshu Gupta [Thu, 4 Sep 2014 19:49:13 +0000 (19:49 +0000)]
am
2be81615: (-s ours) am
9f7c594a: am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
2be81615b2b862ee064d5ed03e8ba44d6168b3ff':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 19:49:08 +0000 (19:49 +0000)]
am
7632ed91: am
525e552e: am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
7632ed91d91906504212cb7acc85128c89d6d3c7':
Do not restore the media button event receiver
Jason Monk [Thu, 4 Sep 2014 19:49:06 +0000 (19:49 +0000)]
am
2d084e75: Merge "Change constants from API review feedback" into lmp-dev
* commit '
2d084e7555715623213f6fdb7bd0af4505710b22':
Change constants from API review feedback
Raph Levien [Thu, 4 Sep 2014 19:47:03 +0000 (12:47 -0700)]
Fix Layout.isRtlCharAt
We weren't getting correct results from Layout.isRtlCharAt, because it
was only testing half of the correct predicate for whether the argument
was inside the run. This patch restores the correct predicate.
Bug:
17381011
Change-Id: Ib0a77cc182f4ca4bfe824e85b7aff7268f465d73
Ye Wen [Thu, 4 Sep 2014 19:45:00 +0000 (19:45 +0000)]
Merge "Add missing mms_config key enableGroupMms to SmsManager (1/2)" into lmp-dev
Jason Monk [Thu, 4 Sep 2014 19:40:29 +0000 (19:40 +0000)]
Merge "Change constants from API review feedback" into lmp-dev
Jason Monk [Thu, 4 Sep 2014 19:07:49 +0000 (15:07 -0400)]
Proxy fixes from API review feedback
Bug:
17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d
Svetoslav [Thu, 4 Sep 2014 19:37:49 +0000 (12:37 -0700)]
Add a missing dependency on a shared JNI library
bug:
17389508
Change-Id: I38e1ad7daf991f37458eac391b472eb3816d7838
Nancy Chen [Thu, 4 Sep 2014 19:29:54 +0000 (19:29 +0000)]
am
c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev
* commit '
c27868a6d085f10f6ca4f4a83c382078648f21e7':
Remove check for voicemail number when parsing URI phone number.
Kenny Guy [Thu, 4 Sep 2014 19:21:52 +0000 (19:21 +0000)]
am
56e125ff: Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev
* commit '
56e125ff1d6d1cde633b1154b07e1efddc5293e9':
Revert "Ensure all RemoteViews use myUserId rather than context."
Nancy Chen [Thu, 4 Sep 2014 19:21:24 +0000 (19:21 +0000)]
Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev
Alan Viverette [Thu, 4 Sep 2014 19:16:40 +0000 (12:16 -0700)]
Clear ripple animations on cancel/end
This prevents subsequent calls to end() from snapping the background
opacity (among others) back to 1.
BUG:
17357749
BUG:
17349157
Change-Id: I2a4870ed588ba98986428983bf29b556cdc9a701
Adam Lesinski [Tue, 2 Sep 2014 23:43:52 +0000 (16:43 -0700)]
Add Configuration changes to UsageStats
Bug:
17354208
Change-Id: I9b2f595e51b656607e30e798926cfb7e25134944
Kenny Guy [Thu, 4 Sep 2014 19:14:24 +0000 (19:14 +0000)]
Merge "Revert "Ensure all RemoteViews use myUserId rather than context."" into lmp-dev
Yorke Lee [Thu, 4 Sep 2014 19:04:21 +0000 (19:04 +0000)]
am
ddd81fb1: Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev
* commit '
ddd81fb1dc5cadc243d1ae617cd4d4c3178fc4dc':
Turn off FORCE_LOGGING in Telecomm
Yorke Lee [Thu, 4 Sep 2014 18:55:29 +0000 (18:55 +0000)]
Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev
Svetoslav [Thu, 4 Sep 2014 18:45:44 +0000 (18:45 +0000)]
am
af08fbbf: Merge "Update accessibility focused virtual view bounds." into lmp-dev
* commit '
af08fbbff429e08426e59fb0911a8be09d6c7062':
Update accessibility focused virtual view bounds.
dcashman [Thu, 4 Sep 2014 18:45:39 +0000 (18:45 +0000)]
am
0dd7e085: Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev
* commit '
0dd7e085f55dadbd5277f5cbb212705dbe27f7a5':
Add upgrade KeySets check to permission pruning on install.
Svetoslav [Thu, 4 Sep 2014 18:45:34 +0000 (18:45 +0000)]
am
ca24b463: Merge "Fix collection iteration index." into lmp-dev
* commit '
ca24b4630e43f48ddeb0a70b918112719c200160':
Fix collection iteration index.
Svetoslav [Thu, 4 Sep 2014 18:40:03 +0000 (18:40 +0000)]
Merge "Update accessibility focused virtual view bounds." into lmp-dev
dcashman [Thu, 4 Sep 2014 18:39:34 +0000 (18:39 +0000)]
Merge "Add upgrade KeySets check to permission pruning on install." into lmp-dev
Svetoslav [Thu, 4 Sep 2014 18:39:01 +0000 (18:39 +0000)]
Merge "Fix collection iteration index." into lmp-dev
Yorke Lee [Thu, 4 Sep 2014 18:33:38 +0000 (11:33 -0700)]
Turn off FORCE_LOGGING in Telecomm
Bug:
17329799
Change-Id: Ic93cfaee62f83b457da3982237170e299c63cf5d
Ye Wen [Thu, 4 Sep 2014 18:30:44 +0000 (11:30 -0700)]
Add missing mms_config key enableGroupMms to SmsManager (1/2)
b/
17390011
Change-Id: I6bef36521de6cd1644f83a667753542313fa8d8b
Jason Monk [Thu, 4 Sep 2014 18:14:37 +0000 (14:14 -0400)]
Change constants from API review feedback
Bug:
17390600
Change-Id: Ie93da8eb6786b7135e8b852804a95f376fcb9d91
Svetoslav [Thu, 4 Sep 2014 18:20:18 +0000 (11:20 -0700)]
Fix collection iteration index.
bug:
17387880
Change-Id: Ic637ce8fa2da87d6f21a222bd70bf627953f57e3
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:42 +0000 (18:17 +0000)]
am
9bfa0736: am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into
* commit '
9bfa073662748e2d0b4b08cfa7fa312e7023f75c':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:38 +0000 (18:17 +0000)]
am
8929642c: am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
8929642ca72981f3c5cd4e7d408d47c724d9127b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:32 +0000 (18:17 +0000)]
am
889ec192: am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
889ec19249fecfa7121c77b4c2bb32a054311cb5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:28 +0000 (18:17 +0000)]
am
9f7c594a: am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9f7c594a05411191d83ccb21655fbd8d52f56189':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:17:24 +0000 (18:17 +0000)]
am
525e552e: am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
525e552eef3e38f3ab1a61377ebe69af43e959d7':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:53 +0000 (18:10 +0000)]
am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
7119fbb63a32f4f51bf07293c0a7f5a3a32abba0':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:50 +0000 (18:10 +0000)]
am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:39 +0000 (18:10 +0000)]
am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
a7ce11070a74f7a0447f0d40d51cb0d3f95999fd':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:35 +0000 (18:10 +0000)]
am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
ae6f2595206d33f04c951c2f3dfff5ede100c942':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:10:31 +0000 (18:10 +0000)]
am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
800f3ca4ddf52fe46d039505266c84b0ad0234b1':
Do not restore the media button event receiver
Michael Wright [Thu, 4 Sep 2014 18:10:05 +0000 (18:10 +0000)]
am
c27c79f1: Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev
* commit '
c27c79f15ea22ad77d7431fe0eaf82c2d393635e':
Add support for SW_CAMERA_LENS_COVER.
George Mount [Thu, 4 Sep 2014 18:10:00 +0000 (18:10 +0000)]
am
ae572ad4: Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev
* commit '
ae572ad4a0a27c9806b4b311d578b5ce27696604':
"Back" with translucent window now sets ActivityOptions.
Michael Wright [Thu, 4 Sep 2014 18:06:59 +0000 (18:06 +0000)]
Merge "Add support for SW_CAMERA_LENS_COVER." into lmp-dev
George Mount [Thu, 4 Sep 2014 18:03:51 +0000 (18:03 +0000)]
Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev
George Mount [Wed, 3 Sep 2014 19:35:09 +0000 (12:35 -0700)]
"Back" with translucent window now sets ActivityOptions.
Also made convertToTranslucent set the canvas opacity.
Bug
16215650
Change-Id: Id4325eaed34cda1269d874f239aeb5f6f82c959f
Baligh Uddin [Thu, 4 Sep 2014 18:00:55 +0000 (18:00 +0000)]
am
576fad6d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
576fad6d19ed527b957967d7ad5c8ffaeea20987':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:00:51 +0000 (18:00 +0000)]
am
84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
84004db40a4d0df26cbe8ca8555f96c8406f1588':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:00:46 +0000 (18:00 +0000)]
am
8331b3e4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
8331b3e46caa1a23498684cbde3fdded54bcff9a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:00:41 +0000 (18:00 +0000)]
am
bee78b3d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
bee78b3d7ee6a1510a37595540628a4d1f42180f':
Import translations. DO NOT MERGE
Ruben Brunk [Thu, 4 Sep 2014 18:00:37 +0000 (18:00 +0000)]
am
bb009ddb: Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev
* commit '
bb009ddb9167058dae8543172511261df020b0ee':
camera2: Fix Nakasi crash-on-start when using Camera2 API.
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:47 +0000 (17:59 +0000)]
am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
4df075bcb5770ba411b6a32c9daeac24da0597e2':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:44 +0000 (17:59 +0000)]
am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
7055778ef5e97f6f83181a44c9b3804632f6f64e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:41 +0000 (17:59 +0000)]
am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:38 +0000 (17:59 +0000)]
am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
409e42a17eeedf125d012ebc3f1d91fcf5812573':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:59:35 +0000 (17:59 +0000)]
am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
14c8acef21136a07e5e750b245874d779f410b53':
Do not restore the media button event receiver
Baligh Uddin [Thu, 4 Sep 2014 17:49:07 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 17:49:03 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 17:48:59 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 17:48:53 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Ruben Brunk [Thu, 4 Sep 2014 17:47:14 +0000 (17:47 +0000)]
Merge "camera2: Fix Nakasi crash-on-start when using Camera2 API." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:19 +0000 (17:46 +0000)]
am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
057eb404363184b75ab0e5d3768a22126703f750':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:15 +0000 (17:46 +0000)]
am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
a9f56d5a050845703bdcfff734d9d189bec2ddec':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:11 +0000 (17:46 +0000)]
am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
Resolve color xml attributes properly. [DO NOT MERGE]
OSDN Git Service
