drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,354 Commits 1 Branch 0 Tags
Commit Graph

161354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 da3050614fc9dc31d39ff87ae5df0261fb76f93c.

Bug: 17480683
Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66
 2014-10-02 08:45:09 +00:00
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
316296511b Merge "Frameworks/base: Fix more aapt issues" 2014-10-02 06:58:39 +00:00
Sreeram Ramachandran
9e987f1d76 am 4f4b81bd: am c04e922f: am 5aaabc0f: Merge "Send app permissions to netd." into lmp-dev 
* commit '4f4b81bd3d6837e05a552bc64b8742ca093a2685':
  Send app permissions to netd.
 2014-10-02 06:38:54 +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
Andreas Gampe
87332a7109 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
 2014-10-01 23:26:06 -07:00
Deepanshu Gupta
2e67a88214 am 92c40bbd: am 8989290b: am 7b13c4d8: Merge "Always resolve enum when resolving resources." into lmp-dev 
* commit '92c40bbd93b73da8c211fa34ee595d7191639273':
  Always resolve enum when resolving resources.
 2014-10-02 04:23:18 +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
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07:00
Deepanshu Gupta
a21ca34494 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]
 2014-10-02 03:34:06 +00:00
Deepanshu Gupta
93bf0696e7 am 541e6e5d: Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 
* commit '541e6e5d47b928f3cd73f9e8f1da83ff722892c8':
  Build layoutlib_create tests. [DO NOT MERGE]
 2014-10-02 03:34:01 +00:00
Deepanshu Gupta
ddbd9bec76 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]
 2014-10-02 03:33:57 +00:00
Deepanshu Gupta
1cbf17f765 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]
 2014-10-02 03:33:53 +00:00
Deepanshu Gupta
d332ff3e3f 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]
 2014-10-02 03:33:48 +00:00
Deepanshu Gupta
c2ffb54fe2 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]
 2014-10-02 03:33:42 +00:00
Deepanshu Gupta
7b13c4d8ec Merge "Always resolve enum when resolving resources." into lmp-dev 2014-10-02 03:27:42 +00:00
Deepanshu Gupta
a2f088b677 Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:22 +00:00
Deepanshu Gupta
541e6e5d47 Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:08 +00:00
Deepanshu Gupta
2d77fad26b Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:03 +00:00
Deepanshu Gupta
ffa4115a0e Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:44 +00:00
Deepanshu Gupta
bae6442159 Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:37 +00:00
Deepanshu Gupta
60f3676e08 Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:32 +00:00
Sreeram Ramachandran
e4a05afe85 Send app permissions to netd. 
Based largely off Robert's http://ag/546170 (thanks!)

Bug: 15413737
Change-Id: I8a1f0a184923c4c0a4935e6b88895bcc05e39f02
 2014-10-01 20:22:34 -07:00
Benson Huang
19766ff938 am 398de894: am 981258e5: [FM] Add FM permission to support FM radio app 
* commit '398de8943b59b50d79ca75d4e811756a97d180f1':
  [FM] Add FM permission to support FM radio app
 2014-10-02 02:22:30 +00:00
Benson Huang
398de8943b am 981258e5: [FM] Add FM permission to support FM radio app 
* commit '981258e5f957899b034a98ebebade1f0366f506a':
  [FM] Add FM permission to support FM radio app
 2014-10-02 02:14:14 +00:00
Benson Huang
981258e5f9 [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
 2014-10-01 18:39:16 -07:00
Alan Viverette
6cb68b4637 am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '8f438e4ccd19da343c37593ec61ba1887a7c304e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 00:59:50 +00:00