Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,168 Commits 3 Branches 0 Tags
eef8d3eb40f2775ca079b4e50ced8d4eafcbc7fd
Commit Graph

154168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
eef8d3eb40 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.
 2014-10-02 11:18:50 +00:00
Lorenzo Colitti
df959707ff 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.
 2014-10-02 11:12:26 +00:00
Lorenzo Colitti
7fe95529e6 Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 2014-10-02 11:05:21 +00:00
Deepanshu Gupta
70d72265b2 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]
 2014-10-02 09:38:27 +00:00
Deepanshu Gupta
4ae7dbbaa0 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]
 2014-10-02 09:38:24 +00:00
Deepanshu Gupta
3a86340106 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]
 2014-10-02 09:38:21 +00:00
Deepanshu Gupta
16df192a2b 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]
 2014-10-02 09:38:18 +00:00
Deepanshu Gupta
8f1258bd08 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]
 2014-10-02 09:38:14 +00:00
Deepanshu Gupta
97a4c96fbc 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]
 2014-10-02 09:38:11 +00:00
Deepanshu Gupta
6b97cb7856 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]
 2014-10-02 09:38:07 +00:00
Deepanshu Gupta
33832bfbad 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]
 2014-10-02 09:38:04 +00:00
Deepanshu Gupta
8308e03f06 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]
 2014-10-02 09:38:01 +00:00
Deepanshu Gupta
0b2d1197bc 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]
 2014-10-02 09:37:58 +00:00
Deepanshu Gupta
fed5977c38 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]
 2014-10-02 09:37:54 +00:00
Justin Koh
4fb046f1a0 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
 2014-10-02 09:37:51 +00:00
Andreas Gampe
d5a908299a am 1e48a1ee: am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 
* commit '1e48a1eec0a5f1d015256e38f627947105af5bac':
  Revert "Frameworks/base: Update to preloaded-classes"
 2014-10-02 09:37:47 +00:00
Deepanshu Gupta
9d47419785 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]
 2014-10-02 09:30:34 +00:00
Deepanshu Gupta
2fca3e944f 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]
 2014-10-02 09:30:31 +00:00
Deepanshu Gupta
81f03898e5 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]
 2014-10-02 09:30:28 +00:00
Deepanshu Gupta
4d19dc0ec1 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]
 2014-10-02 09:30:24 +00:00
Deepanshu Gupta
6ed3fadb22 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]
 2014-10-02 09:30:21 +00:00
Deepanshu Gupta
7349e63d11 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]
 2014-10-02 09:30:18 +00:00
Deepanshu Gupta
fcca815162 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]
 2014-10-02 09:30:14 +00:00
Deepanshu Gupta
7d573818a0 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]
 2014-10-02 09:30:11 +00:00
Deepanshu Gupta
dd5d1fdd07 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]
 2014-10-02 09:30:08 +00:00
Deepanshu Gupta
71412900b7 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]
 2014-10-02 09:30:04 +00:00
Deepanshu Gupta
19fe9f1bf5 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]
 2014-10-02 09:30:01 +00:00
Justin Koh
90eca96f3c 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
 2014-10-02 09:29:57 +00:00
Andreas Gampe
1e48a1eec0 am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 
* commit 'c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
  Revert "Frameworks/base: Update to preloaded-classes"
 2014-10-02 09:29:54 +00:00
Deepanshu Gupta
107e1fb4b8 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]
 2014-10-02 08:51:09 +00:00
Deepanshu Gupta
d3adf40ee0 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]
 2014-10-02 08:51:06 +00:00
Deepanshu Gupta
ba526a2888 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]
 2014-10-02 08:51:02 +00:00
Deepanshu Gupta
a9787de33c 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]
 2014-10-02 08:50:58 +00:00
Deepanshu Gupta
75f2f99339 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]
 2014-10-02 08:50:54 +00:00
Deepanshu Gupta
473a270852 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]
 2014-10-02 08:50:51 +00:00
Deepanshu Gupta
d24b45c807 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]
 2014-10-02 08:50:47 +00:00
Deepanshu Gupta
42099d45c3 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]
 2014-10-02 08:50:43 +00:00
Deepanshu Gupta
b183c1812b 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]
 2014-10-02 08:50:38 +00:00
Deepanshu Gupta
9eb0cd1274 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]
 2014-10-02 08:50:34 +00:00
Deepanshu Gupta
82eecaf826 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]
 2014-10-02 08:50:31 +00:00
Justin Koh
f7aac12e1b 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
 2014-10-02 08:50:27 +00:00
Andreas Gampe
c152c7aad6 Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev 2014-10-02 08:45:47 +00:00
Andreas Gampe
16626a7ee9 Revert "Frameworks/base: Update to preloaded-classes" 
Breaks shamu for unknown reason.

This reverts commit da3050614f.

Bug: 17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
 2014-10-02 08:45:09 +00:00
Sreeram Ramachandran
4f4b81bd3d am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit 'c04e922f67cacfc428d09fd266f7c9b36a6fb472':
  Send app permissions to netd.
 2014-10-02 06:34:16 +00:00
Sreeram Ramachandran
c04e922f67 am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '5aaabc0fa66dd755843f040fe634962477107950':
  Send app permissions to netd.
 2014-10-02 06:29:37 +00:00
Sreeram Ramachandran
5aaabc0fa6 Merge "Send app permissions to netd." into lmp-dev 2014-10-02 06:26:27 +00:00
Deepanshu Gupta
92c40bbd93 am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '8989290b5e7869ba419d72bd4daf6636dc450430':
  Always resolve enum when resolving resources.
 2014-10-02 04:05:56 +00:00
Deepanshu Gupta
8989290b5e am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '7b13c4d8ecc517ae64cc5bd14c40eaef29e8281c':
  Always resolve enum when resolving resources.
 2014-10-02 03:44:59 +00:00
Deepanshu Gupta
ae74287e03 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]
 2014-10-02 03:38:44 +00:00
Deepanshu Gupta
ae4cb17a14 am 76aff1f6: Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 
* commit '76aff1f6ab84b8ac9f4a48ae7dff62ece00e1b97':
  Resource resolution bug fix. [DO NOT MERGE]
 2014-10-02 03:34:24 +00:00