OSDN Git Service
George Mount [Thu, 2 Oct 2014 14:39:41 +0000 (14:39 +0000)]
am
a590a95c: am
d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
* commit '
a590a95c4d3b68f9df40b76eef1462d159ff568f':
Fix ChangeTransform works only once on a View.
George Mount [Thu, 2 Oct 2014 14:33:15 +0000 (14:33 +0000)]
am
d982b582: Merge "Fix ChangeTransform works only once on a View." into lmp-dev
* commit '
d982b582d1993288347f771177f6889fe14fb387':
Fix ChangeTransform works only once on a View.
George Mount [Thu, 2 Oct 2014 14:27:18 +0000 (14:27 +0000)]
Merge "Fix ChangeTransform works only once on a View." into lmp-dev
Lorenzo Colitti [Thu, 2 Oct 2014 11:18:50 +0000 (11:18 +0000)]
am
df959707: am
7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
* commit '
df959707ff086ae1ffe516b516bfd99ac463b803':
Revert the configKey generation algorithm to what it was in K.
Lorenzo Colitti [Thu, 2 Oct 2014 11:12:26 +0000 (11:12 +0000)]
am
7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
* commit '
7fe95529e638467b77372dcac0efe51529e3bde1':
Revert the configKey generation algorithm to what it was in K.
Lorenzo Colitti [Thu, 2 Oct 2014 11:05:19 +0000 (11:05 +0000)]
Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:27 +0000 (09:38 +0000)]
am
9d474197: am
107e1fb4: am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
9d474197856fcfc3e6f0aee7c1139d3cf493d067':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:24 +0000 (09:38 +0000)]
am
2fca3e94: am
d3adf40e: am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
2fca3e944f263bd50e4f61049399bddf957c936c':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:21 +0000 (09:38 +0000)]
am
81f03898: am
ba526a28: am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
81f03898e59400bb77eb6525956b06e6762b550e':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:18 +0000 (09:38 +0000)]
am
4d19dc0e: am
a9787de3: am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
4d19dc0ec185c5e3c79d49e45e2df15c803e3f05':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:14 +0000 (09:38 +0000)]
am
6ed3fadb: am
75f2f993: am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
6ed3fadb22c1a87c8a923a738481df057d5f8211':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:11 +0000 (09:38 +0000)]
am
7349e63d: am
473a2708: am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
7349e63d112838e3c925e03b6e1f99fdb95b1f6c':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:07 +0000 (09:38 +0000)]
am
fcca8151: am
d24b45c8: am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
fcca815162f9dc4d3ffda483d2f6da6d2a43e984':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:04 +0000 (09:38 +0000)]
am
7d573818: am
42099d45: am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
7d573818a0b05999f6f8c58c0c5785860064cb52':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:38:01 +0000 (09:38 +0000)]
am
dd5d1fdd: am
b183c181: am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
dd5d1fdd07877ead5ed7edc9ed826730f441147d':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:37:58 +0000 (09:37 +0000)]
am
71412900: am
9eb0cd12: am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
71412900b724fd194d9eed2457aeaa12f7226df0':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:37:54 +0000 (09:37 +0000)]
am
19fe9f1b: am
82eecaf8: am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
19fe9f1bf51521a58097374c1af336fec6548ea0':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 09:37:51 +0000 (09:37 +0000)]
am
90eca96f: am
f7aac12e: am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
90eca96f3ca93367545ca9c3d291a9a46b980270':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 09:37:47 +0000 (09:37 +0000)]
am
1e48a1ee: am
c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
* commit '
1e48a1eec0a5f1d015256e38f627947105af5bac':
Revert "Frameworks/base: Update to preloaded-classes"
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:34 +0000 (09:30 +0000)]
am
107e1fb4: am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
107e1fb4b8ec4c16c5a6ed4635cb0acaea8e2b39':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:31 +0000 (09:30 +0000)]
am
d3adf40e: am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
d3adf40ee0845844ed132dd0b25ec0102b9bf919':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:28 +0000 (09:30 +0000)]
am
ba526a28: am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
ba526a288811bc6520ad9a70d57e7ef774bbb802':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:24 +0000 (09:30 +0000)]
am
a9787de3: am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
a9787de33c703fbfbb89b02d9d3d5642305084f8':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:21 +0000 (09:30 +0000)]
am
75f2f993: am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
75f2f993392a3903d160e7fed81c0b7ff5cf76f1':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:18 +0000 (09:30 +0000)]
am
473a2708: am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
473a270852c4316f9840f5190b1cdde8db9e1fef':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:14 +0000 (09:30 +0000)]
am
d24b45c8: am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
d24b45c807aa788bbb25647166d155d0ed385ddf':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:11 +0000 (09:30 +0000)]
am
42099d45: am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
42099d45c3f39989c9c4ec1a5f67206f9c23342b':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:08 +0000 (09:30 +0000)]
am
b183c181: am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
b183c1812b76411161e9f71a313d2f6384ab9162':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:04 +0000 (09:30 +0000)]
am
9eb0cd12: am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
9eb0cd12742bdd6098932eedfd33a0b14f2196c9':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 09:30:01 +0000 (09:30 +0000)]
am
82eecaf8: am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
82eecaf826ab06c4f3cb0716a009ff0c8ae00711':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 09:29:57 +0000 (09:29 +0000)]
am
f7aac12e: am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
f7aac12e1bc766a4357ca29d2f248eef265097f8':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 09:29:54 +0000 (09:29 +0000)]
am
c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
* commit '
c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
Revert "Frameworks/base: Update to preloaded-classes"
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:09 +0000 (08:51 +0000)]
am
ae74287e: (-s ours) am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae74287e036b432ca394cbc497386547b16c17ff':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:06 +0000 (08:51 +0000)]
am
ae4cb17a: (-s ours) am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
ae4cb17a14d2a66961728d3cbd907cdba3f2f6d6':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:51:02 +0000 (08:51 +0000)]
am
d00d2ff2: (-s ours) am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
d00d2ff2079ca4e77173e3389834416494c7900f':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:58 +0000 (08:50 +0000)]
am
735229c5: (-s ours) am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
735229c5a8286f1ecff5cf54d9ce2c06d7f97d51':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:54 +0000 (08:50 +0000)]
am
925abb6d: (-s ours) am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
925abb6d983aef0016b5828349d53cc5a11ebad8':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:51 +0000 (08:50 +0000)]
am
a21ca344: (-s ours) am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a21ca3449457c5a80b5f06ca9a1fe7b17eb33bff':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:47 +0000 (08:50 +0000)]
am
93bf0696: (-s ours) am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
93bf0696e74282fea614120f7e26951111150e48':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:43 +0000 (08:50 +0000)]
am
ddbd9bec: (-s ours) am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:38 +0000 (08:50 +0000)]
am
1cbf17f7: (-s ours) am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
1cbf17f7654d5ddb66ce76e0f50fe7f170726e20':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:34 +0000 (08:50 +0000)]
am
d332ff3e: (-s ours) am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
d332ff3e3f647b9514ecff1f146464fbc1a93372':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 08:50:31 +0000 (08:50 +0000)]
am
c2ffb54f: (-s ours) am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
c2ffb54fe29d5fcbdd866fd304a9e97af825221a':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Justin Koh [Thu, 2 Oct 2014 08:50:27 +0000 (08:50 +0000)]
am
bf6f081c: (-s ours) am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
bf6f081cda7360810645cf6bf932687df1cfae00':
DO NOT MERGE Hide the volume panel for watches for now
Andreas Gampe [Thu, 2 Oct 2014 08:45:45 +0000 (08:45 +0000)]
Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev
Andreas Gampe [Thu, 2 Oct 2014 08:42:00 +0000 (08:42 +0000)]
Revert "Frameworks/base: Update to preloaded-classes"
Breaks shamu for unknown reason.
This reverts commit
da3050614fc9dc31d39ff87ae5df0261fb76f93c.
Bug:
17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
Sreeram Ramachandran [Thu, 2 Oct 2014 06:34:16 +0000 (06:34 +0000)]
am
c04e922f: am
5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '
c04e922f67cacfc428d09fd266f7c9b36a6fb472':
Send app permissions to netd.
Sreeram Ramachandran [Thu, 2 Oct 2014 06:29:37 +0000 (06:29 +0000)]
am
5aaabc0f: Merge "Send app permissions to netd." into lmp-dev
* commit '
5aaabc0fa66dd755843f040fe634962477107950':
Send app permissions to netd.
Sreeram Ramachandran [Thu, 2 Oct 2014 06:26:26 +0000 (06:26 +0000)]
Merge "Send app permissions to netd." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 04:05:56 +0000 (04:05 +0000)]
am
8989290b: am
7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev
* commit '
8989290b5e7869ba419d72bd4daf6636dc450430':
Always resolve enum when resolving resources.
Deepanshu Gupta [Thu, 2 Oct 2014 03:44:59 +0000 (03:44 +0000)]
am
7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev
* commit '
7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
Always resolve enum when resolving resources.
Deepanshu Gupta [Thu, 2 Oct 2014 03:38:44 +0000 (03:38 +0000)]
am
fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
* commit '
fca5e5577f3690b03e783e4208379011aec46d28':
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:24 +0000 (03:34 +0000)]
am
76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
* commit '
76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
Resource resolution bug fix. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:19 +0000 (03:34 +0000)]
am
57933834: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
* commit '
579338345721351313d4c3cd2a5114a0d135028d':
Fix Tests after cherry picks. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:14 +0000 (03:34 +0000)]
am
52af468b: Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
* commit '
52af468b5e0b6daa1906694b37584366d616159f':
Update intelliJ copyright profile [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:10 +0000 (03:34 +0000)]
am
891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
* commit '
891f38d181505406298bb3b922a33e24de6aaf02':
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:06 +0000 (03:34 +0000)]
am
a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
* commit '
a2f088b6775f0cd0a8b7e3b35e16f13de3f67b01':
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:34:01 +0000 (03:34 +0000)]
am
541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
* commit '
541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
Build layoutlib_create tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:57 +0000 (03:33 +0000)]
am
2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit '
2d77fad26b0fa2203366d08aeccec9b564a70647':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:53 +0000 (03:33 +0000)]
am
ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
* commit '
ffa4115a0ed065d816171c68609cd738672f5e51':
Get filename from File faster [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:48 +0000 (03:33 +0000)]
am
bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
bae6442159838206d826775bcebf92fa86f64a93':
Add testing framework to LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:42 +0000 (03:33 +0000)]
am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:27:41 +0000 (03:27 +0000)]
Merge "Always resolve enum when resolving resources." into lmp-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Sreeram Ramachandran [Wed, 24 Sep 2014 16:16:19 +0000 (09:16 -0700)]
Send app permissions to netd.
Based largely off Robert's http://ag/546170 (thanks!)
Bug:
15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
Benson Huang [Thu, 2 Oct 2014 02:14:14 +0000 (02:14 +0000)]
am
981258e5: [FM] Add FM permission to support FM radio app
* commit '
981258e5f957899b034a98ebebade1f0366f506a':
[FM] Add FM permission to support FM radio app
Benson Huang [Tue, 23 Sep 2014 02:57:40 +0000 (10:57 +0800)]
[FM] Add FM permission to support FM radio app
Add FM permission like KK to support FM radio app.
Change-Id: Ifb76f63e3136a5f88306903fd28e9abbb01e69c9
Signed-off-by: Benson Huang <benson.huang@mediatek.com>
Conflicts:
data/etc/platform.xml
Alan Viverette [Thu, 2 Oct 2014 00:55:25 +0000 (00:55 +0000)]
Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev
Dianne Hackborn [Thu, 2 Oct 2014 00:32:02 +0000 (00:32 +0000)]
am
796d6ece: am
c338784b: Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '
796d6eced1e23217914e639da45d9371baf8a5b0':
More work on issue #
17656716: Unhandled exception in Window Manager
Dianne Hackborn [Thu, 2 Oct 2014 00:27:48 +0000 (00:27 +0000)]
am
c338784b: Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
* commit '
c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
More work on issue #
17656716: Unhandled exception in Window Manager
Dianne Hackborn [Thu, 2 Oct 2014 00:23:17 +0000 (00:23 +0000)]
Merge "More work on issue #
17656716: Unhandled exception in Window Manager" into lmp-dev
Erik Pasternak [Thu, 2 Oct 2014 00:09:47 +0000 (00:09 +0000)]
am
739bf81d: am
4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '
739bf81dd130957c9bc09abc4e25732af2d675c0':
Implement auto-sleep functionality.
Erik Pasternak [Thu, 2 Oct 2014 00:04:01 +0000 (00:04 +0000)]
am
4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev
* commit '
4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
Implement auto-sleep functionality.
Erik Pasternak [Thu, 2 Oct 2014 00:00:39 +0000 (00:00 +0000)]
Merge "Implement auto-sleep functionality." into lmp-dev
Dianne Hackborn [Wed, 1 Oct 2014 21:59:58 +0000 (14:59 -0700)]
More work on issue #
17656716: Unhandled exception in Window Manager
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock. This was the original intention
of it, but part was missed.
Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it. And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing. So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.
Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.
Oh and fix a crash in the settings provider I noticed in APR.
Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
Alan Viverette [Wed, 1 Oct 2014 23:53:24 +0000 (16:53 -0700)]
Remove Holo fast scroll preview from Material overlay themes
These were supposed to be removed when we updated the fast scroll
preview background for Material.
BUG:
17765143
Change-Id: I596398ea2e105fef9c92545d16955e684d980f73
Jeff Sharkey [Wed, 1 Oct 2014 23:54:04 +0000 (23:54 +0000)]
am
3a14bc84: am
f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
* commit '
3a14bc8430dbdafbf8d2484b0b4396034f78ae48':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
Jeff Sharkey [Wed, 1 Oct 2014 23:48:49 +0000 (23:48 +0000)]
am
f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
* commit '
f178591f26a535ec3cffa3520c3ca387ec44959b':
Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
Jeff Sharkey [Wed, 1 Oct 2014 23:43:55 +0000 (23:43 +0000)]
Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev
Alan Viverette [Wed, 1 Oct 2014 23:43:02 +0000 (23:43 +0000)]
Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev
Alan Viverette [Wed, 1 Oct 2014 23:41:31 +0000 (16:41 -0700)]
Manage pressed state during drag-to-open
BUG:
17573390
Change-Id: Ia85d7b51d6e4a18dcbf99b930f9f7c045697a31b
Dianne Hackborn [Wed, 1 Oct 2014 23:41:07 +0000 (23:41 +0000)]
am
9a4afb3f: am
c3e7f87b: Merge "Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build." into lmp-dev
* commit '
9a4afb3f5172cdd68e14fb0e48f48d619420cd89':
Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build.
ztenghui [Wed, 1 Oct 2014 23:41:00 +0000 (23:41 +0000)]
am
9ad17521: am
f9033048: Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
* commit '
9ad17521ac073562991cddb78f14d6df8d5fd05a':
+ correcting shadow visual appearance (b/
17610926)
Svetoslav [Wed, 1 Oct 2014 23:36:26 +0000 (23:36 +0000)]
am
304a3528: am
d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
* commit '
304a35287adc757562e03345dc17899522a43a35':
Fix accessiblity introspection from the shell user regression.
Dianne Hackborn [Wed, 1 Oct 2014 23:35:49 +0000 (23:35 +0000)]
am
c3e7f87b: Merge "Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build." into lmp-dev
* commit '
c3e7f87bf9930a20c37609f567f5d88305fb1ddd':
Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build.
ztenghui [Wed, 1 Oct 2014 23:35:45 +0000 (23:35 +0000)]
am
f9033048: Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
* commit '
f903304896809039430c5e52bd0c24052f51b14f':
+ correcting shadow visual appearance (b/
17610926)
Dianne Hackborn [Wed, 1 Oct 2014 23:31:49 +0000 (23:31 +0000)]
am
bfa6190f: am
144508d5: Merge "Revert white space changes." into lmp-dev
* commit '
bfa6190fcc5ac607bf7045963d57b06cc2b16207':
Revert white space changes.
Svetoslav [Wed, 1 Oct 2014 23:30:22 +0000 (23:30 +0000)]
am
d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev
* commit '
d35b072dca42d249c219c886322c122739b086d7':
Fix accessiblity introspection from the shell user regression.
Dianne Hackborn [Wed, 1 Oct 2014 23:29:48 +0000 (23:29 +0000)]
Merge "Fix issue #
17740687: Device does not boot after flashing LMP dev TOT(
1478825) build." into lmp-dev
ztenghui [Wed, 1 Oct 2014 23:29:31 +0000 (23:29 +0000)]
Merge "+ correcting shadow visual appearance (b/
17610926)" into lmp-dev
OSDN Git Service
