OSDN Git Service
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
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
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]
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
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: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 18:55:29 +0000 (18:55 +0000)]
Merge "Turn off FORCE_LOGGING in Telecomm" into lmp-dev
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: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
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]
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:08 +0000 (17:46 +0000)]
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 '
e19464aae4ba251c758f3b27601ef3470e0a8c2d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:46:04 +0000 (17:46 +0000)]
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 '
5fb35780a53c239e34aec8beccd328cad9145e3d':
Do not restore the media button event receiver
Chris Wren [Thu, 4 Sep 2014 17:42:17 +0000 (17:42 +0000)]
Merge "Honor per-app sensitivity setting." into lmp-dev
RoboErik [Thu, 4 Sep 2014 17:38:00 +0000 (17:38 +0000)]
Merge "Update VolumeProvider apis per feedback" into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:28 +0000 (17:33 +0000)]
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 '
a5176670c8ef21b42e0a2e7db07c968e3ceacb39':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:25 +0000 (17:33 +0000)]
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 '
44db2b3ef65ff2b0aa340018a6db93cdd52caa60':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:21 +0000 (17:33 +0000)]
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 '
b79bb54e92b03bc032a91084f8a5ab7246136d9f':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:33:13 +0000 (17:33 +0000)]
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 '
9ee1556d601e1f1f60a01bb7137bad48a7923a3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:33:09 +0000 (17:33 +0000)]
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 '
daf113b118c658a493bac194d3b5ba8ab91dbd62':
Do not restore the media button event receiver
Amith Yamasani [Thu, 4 Sep 2014 17:31:31 +0000 (17:31 +0000)]
Merge "Allow adb install to work even if unknown sources is disallowed" into lmp-dev
Yorke Lee [Thu, 4 Sep 2014 17:27:23 +0000 (17:27 +0000)]
Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev
Kenny Guy [Thu, 4 Sep 2014 17:16:17 +0000 (18:16 +0100)]
Revert "Ensure all RemoteViews use myUserId rather than context."
This reverts commit
5287e37687f117ac0b690100ad90842eff58d15a.
Reverting because only worked if settings cache had been populated
already.
Bug:
17302505
Change-Id: I4360606e9d9c6409951f0a02bd0b78c55085e0c6
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:13 +0000 (17:22 +0000)]
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 '
033a54ec746bd8a4c5913f8290deb4a4ec653c50':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)]
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 '
5d1755e9f51f81d54a3566aa6304919fbf467091':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:07 +0000 (17:22 +0000)]
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 '
f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:22:04 +0000 (17:22 +0000)]
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 '
296b120c3053db8b92fb84cb7f433da7f4e99a25':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:22:01 +0000 (17:22 +0000)]
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 '
5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:58 +0000 (17:14 +0000)]
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 '
c33fc8de1ddd2d27a499c146169b870513afca3b':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:53 +0000 (17:14 +0000)]
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 '
c634383ac49b03cd8fd152b4278cad1b94b84bcf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)]
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 '
338e32ba521df8cbd295e69d8f20626452baa4a5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)]
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 '
a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:14:42 +0000 (17:14 +0000)]
am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2':
Do not restore the media button event receiver
Brian Carlstrom [Thu, 4 Sep 2014 16:52:31 +0000 (09:52 -0700)]
Used LOCAL_SHARED_LIBRARIES for proper dependencies
bug:
15938254
Change-Id: I710f689e8bcad66988ef3aa0aa189b185c8ad662
Ricardo Cervera [Thu, 4 Sep 2014 16:26:48 +0000 (16:26 +0000)]
am
909cdff4: am
c5b5366f: am
ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit '
909cdff437ad91ebb0d498389d1a352fca5c8883':
docs: Added SONY logo (hi-res) for Wear site
Ricardo Cervera [Thu, 4 Sep 2014 16:16:24 +0000 (16:16 +0000)]
am
c5b5366f: am
ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit '
c5b5366f1ba236a98cb5aa044b89c6302baf4540':
docs: Added SONY logo (hi-res) for Wear site
Wink Saville [Thu, 4 Sep 2014 16:10:16 +0000 (16:10 +0000)]
Merge "Cleanup ISub.aidl" into lmp-dev
Amith Yamasani [Thu, 4 Sep 2014 00:47:34 +0000 (17:47 -0700)]
Allow adb install to work even if unknown sources is disallowed
adb installs should continue to work for developer usecases,
but PackageInstaller continues to be blocked for sideloading
via the UI - browser, downloads, etc.
Bug:
13760585
Change-Id: I4f8c1445448584c17e5acf77b399579c2643f333
Ricardo Cervera [Thu, 4 Sep 2014 16:05:25 +0000 (16:05 +0000)]
am
ddfe9d11: docs: Added SONY logo (hi-res) for Wear site
* commit '
ddfe9d11fc11a0e4fafb71703a8212b7671cb354':
docs: Added SONY logo (hi-res) for Wear site
Ricardo Cervera [Thu, 4 Sep 2014 15:52:39 +0000 (08:52 -0700)]
docs: Added SONY logo (hi-res) for Wear site
Change-Id: I64441072a9f6dbf6eb209c954a43056c19f29551
Chris Wren [Tue, 2 Sep 2014 21:23:51 +0000 (17:23 -0400)]
Honor per-app sensitivity setting.
Settings are stored by NotificationManagerService in the policy file,
and are communicated to NotificationListeners via a hidden API on the
RankingMap object.
Bug:
16324353
Change-Id: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Alexandra Gherghina [Thu, 4 Sep 2014 15:33:48 +0000 (15:33 +0000)]
Merge "Fix NPE from empty PackageInfo" into lmp-dev
Derek Sollenberger [Thu, 4 Sep 2014 15:01:26 +0000 (15:01 +0000)]
Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev
Alexandra Gherghina [Fri, 29 Aug 2014 12:43:59 +0000 (13:43 +0100)]
Fix NPE from empty PackageInfo
Bug:
17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
Winson Chung [Tue, 2 Sep 2014 01:08:39 +0000 (18:08 -0700)]
Delay in app transition until home animation completes. (Bug
17012456)
Change-Id: I3469738a70bd872ff03c48c23201d4e0b6c8d8bb
Dan Sandler [Thu, 4 Sep 2014 13:36:33 +0000 (13:36 +0000)]
Merge "Notification: Limit length of accepted strings" into lmp-dev
OSDN Git Service
