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

2779 Commits

Author SHA1 Message Date
Adam Lesinski
587133cf2c am b5a92f26: am f064f669: Merge "AAPT: Dump installLocation in badging" into lmp-dev 
* commit 'b5a92f26b68b9c35ad9a5a86fdee4e21b489bb92':
  AAPT: Dump installLocation in badging
 2014-08-22 21:24:24 +00:00
Adam Lesinski
caf797c84a AAPT: Dump installLocation in badging 
Bug:17033144
Change-Id: I87dea9af47eef8bcba1465df9b49e355ac6346ec
 2014-08-22 13:01:11 -07:00
Adam Lesinski
dacbaca1e4 am f425ba28: am 420a3801: am 247d27d1: Merge "Add better error message for AAPT file conflicts" into lmp-dev 
* commit 'f425ba2835b6e865e4dd1d4dfc2407d52f34ebde':
  Add better error message for AAPT file conflicts
 2014-08-21 22:18:05 +00:00
Adam Lesinski
949c59d06c am 13c95b62: am 4a3f39a2: am db2a74d4: Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev 
* commit '13c95b62d9036fc7c8c419115841b291b773ed56':
  AAPT: mipmaps should not end up in Splits
 2014-08-21 22:17:59 +00:00
Adam Lesinski
324d45fa97 am 420a3801: am 247d27d1: Merge "Add better error message for AAPT file conflicts" into lmp-dev 
* commit '420a3801d0adc2e68900052b2d06fcfebb5daa98':
  Add better error message for AAPT file conflicts
 2014-08-21 22:13:19 +00:00
Adam Lesinski
7ef434b597 am 4a3f39a2: am db2a74d4: Merge "AAPT: mipmaps should not end up in Splits" into lmp-dev 
* commit '4a3f39a249adcfcd49b2175c7144524fe159e48d':
  AAPT: mipmaps should not end up in Splits
 2014-08-21 22:13:14 +00:00
Adam Lesinski
d255aba093 Merge "Add better error message for AAPT file conflicts" into lmp-dev 2014-08-21 22:00:25 +00:00
Adam Lesinski
27f69f4e06 AAPT: mipmaps should not end up in Splits 
Mipmaps are never filtered, and so they will always
end up in the base APK. Make sure they get omitted from
any split.

Change-Id: Id24b082bc9bd2d3f031a58bd0de4d30b4f0de7e0
 2014-08-21 13:59:46 -07:00
Adam Lesinski
48f05d29f3 Add better error message for AAPT file conflicts 
Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.

Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612
 2014-08-21 20:54:01 +00:00
Adam Lesinski
b915e9104d am 34b21847: am ad876f74: am 3a0a53a9: Merge "Use the correct versionCode for Split APKs" into lmp-dev 
* commit '34b21847a2e5f708e878e9ad617a794d8a445c8c':
  Use the correct versionCode for Split APKs
 2014-08-21 18:52:25 +00:00
Adam Lesinski
ee7c873960 am ad876f74: am 3a0a53a9: Merge "Use the correct versionCode for Split APKs" into lmp-dev 
* commit 'ad876f7451ca1aa0985404301e45f616ad8dd7b3':
  Use the correct versionCode for Split APKs
 2014-08-21 18:42:40 +00:00
Adam Lesinski
6a7d2757a9 Use the correct versionCode for Split APKs 
Insert the correct versionCode into the generated
Split AndroidManifest.xml.

Change-Id: I0aec797b5a4ff8bd70f9394b18aee5ad292b37c8
 2014-08-21 11:00:09 -07:00
Adam Lesinski
5b028aaa40 am a22046e2: am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'a22046e20117aa49cbd92821bf949b3c5067e309':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:59:09 +00:00
Adam Lesinski
ad2d935763 am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'c931d0d8540f7648d5bb247fa1b03e492363debb':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:48:33 +00:00
Adam Lesinski
6022debdbc AAPT: Fix regression generating dynamic ref table for shared libraries 
AAPT stopped generating dynamic reference tables for shared libraries.

Change-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d
 2014-08-20 17:55:33 -07:00
Deepanshu Gupta
68e3c9c8c9 am 015f660a: am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 
* commit '015f660a04135dccb931af1b6bb24d28b2b8a030':
  Fix "@null" resource values in LayoutLib.
 2014-08-20 00:39:27 +00:00
Deepanshu Gupta
48458f0505 am 6a006b9a: am 6cd282f4: am df6d9cd8: Merge "Add time to status bar and fix wifi icon." into lmp-dev 
* commit '6a006b9a33d807bb2fda859c34542456de379446':
  Add time to status bar and fix wifi icon.
 2014-08-20 00:39:22 +00:00
Deepanshu Gupta
8292994c20 am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 
* commit '0c64e11d1c9deb6d425be80808372f5bc1730fd7':
  Fix "@null" resource values in LayoutLib.
 2014-08-20 00:31:04 +00:00
Deepanshu Gupta
c6ec49e705 am 6cd282f4: am df6d9cd8: Merge "Add time to status bar and fix wifi icon." into lmp-dev 
* commit '6cd282f44468ff9143913c2fc9e1e2470c247cfd':
  Add time to status bar and fix wifi icon.
 2014-08-20 00:31:00 +00:00
Adam Lesinski
526dae5762 am 38e7e051: am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev 
* commit '38e7e05134f7b27809aa27eba3fdeaec2e576807':
  Allow enum generated IDs to reuse existing IDs
 2014-08-19 23:52:54 +00:00
Adam Lesinski
662e3221f7 am f668e0ba: am f3d07927: Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev 
* commit 'f668e0ba54fa836a818807ec6f76600fc97343ae':
  Allow enum generated IDs to reuse existing IDs
 2014-08-19 23:44:42 +00:00
Deepanshu Gupta
92973b8f37 Merge "Add time to status bar and fix wifi icon." into lmp-dev 2014-08-19 21:23:09 +00:00
Deepanshu Gupta
486ed3da0a Merge "Fix "@null" resource values in LayoutLib." into lmp-dev 2014-08-19 02:43:23 +00:00
Deepanshu Gupta
151b68ddc2 Fix "@null" resource values in LayoutLib. 
Bug: http://b.android.com/74072
Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542
 2014-08-19 17:16:48 -07:00
Adam Lesinski
43a0df04b0 Allow enum generated IDs to reuse existing IDs 
Change-Id: Ida5dbbce1c4ecb0a4e57511555cec6448737be25
 2014-08-19 03:46:00 +00:00
Adam Lesinski
67edc212d5 am 1e188ad9: am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit '1e188ad96a0f9fffcf17e1f5a2e843bc8c8884cb':
  Include build number in aapt version
 2014-08-19 00:17:41 +00:00
Adam Lesinski
0ef02eac4e am aae8a25a: am 427964ed: Merge "Include build number in aapt version" into lmp-dev 
* commit 'aae8a25abafd824a7d6f644ca00518029e822a03':
  Include build number in aapt version
 2014-08-19 00:09:12 +00:00
Deepanshu Gupta
553a4e9138 Add time to status bar and fix wifi icon. 
Add vector drawable for wifi icon. Also add time to the status bar.

Change-Id: I01da833087a607e9bb6ff085929e3844990179f8
 2014-08-18 16:46:29 -07:00
Adam Lesinski
5f5bad4b0c am 8efa12ef: am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit '8efa12ef92a03ae98da2ed1856501c2f5f34a17d':
  Revert "Include build number in aapt version"
 2014-08-18 23:25:03 +00:00
Adam Lesinski
5da86bc21a am 4b9b84c5: am f611c1b5: Merge "Revert "Include build number in aapt version"" into lmp-dev 
* commit '4b9b84c5db6b0b6ba629cf64bc894016fe2cf0c1':
  Revert "Include build number in aapt version"
 2014-08-18 23:16:26 +00:00
Adam Lesinski
d88e64ebb1 am 9e2f9205: am fdbcc8e5: am a7ce555e: Include build number in aapt version 
* commit '9e2f9205fbc94f8a6ed4ddb3caf93019d8c9ed8d':
  Include build number in aapt version
 2014-08-18 22:11:02 +00:00
Adam Lesinski
98eacc9f0a am fdbcc8e5: am a7ce555e: Include build number in aapt version 
* commit 'fdbcc8e52c90c09a65494c148243bd1e7109b71b':
  Include build number in aapt version
 2014-08-18 22:02:38 +00:00
Adam Lesinski
71809ee7f6 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
 2014-08-18 21:08:15 +00:00
Adam Lesinski
9a9a17eb07 Revert "Include build number in aapt version" 
This reverts commit a7ce555ee82ed91345a54ee171dc9a415b65e134.

Change-Id: I1018747766963e75bec11ddb01ba6d138f133959
 2014-08-18 22:39:38 +00:00
Deepanshu Gupta
8d030f7094 am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '2d1aa0f63f133e0db3c621cdff5e48ce513f8fdc':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:28:28 +00:00
Deepanshu Gupta
6e8a98c8b7 am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit 'a4ceb9e64cd1ee6302e41c7799ebb6610af96d0e':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 18:06:07 +00:00
Brian Carlstrom
18a7b459f1 am 7c8318c0: Merge "PackageInfo is a class, not a struct" 
* commit '7c8318c0e85540739afba3e8c0f922176bc299cd':
  PackageInfo is a class, not a struct
 2014-08-17 23:55:44 +00:00
Brian Carlstrom
4d4e450a39 PackageInfo is a class, not a struct 
(cherry picked from commit 646d1b8ea801d92b04ead6cbae2899d8256ec3ff)

Change-Id: Id9ddc520fbfc4787c3b267df9a35a45e8cc52d65
 2014-08-17 16:10:48 -07:00
Deepanshu Gupta
4b5ccda918 am 1367411f: am 2d1aa0f6: am 8f7cc496: am a4ceb9e6: am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '1367411f33fadcf1258e3f3c4a514073e98618e0':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-18 19:40:58 +00:00
Brian Carlstrom
fac7ade02e am f71a2835: Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp 
* commit 'f71a28354cf3339a744b4abb9571fe98f7bad4ee':
  PackageInfo is a class, not a struct
 2014-08-17 23:52:36 +00:00
Adam Lesinski
49497e5171 am c1c61da5: am 799b0a34: am 068f8521: Merge "AAPT: Output only 64-bit arch when multiArch is true" into lmp-dev 
* commit 'c1c61da5ace56568dccebb90804f86d07221345d':
  AAPT: Output only 64-bit arch when multiArch is true
 2014-08-16 07:08:47 +00:00
Adam Lesinski
e47fd12905 AAPT: Output only 64-bit arch when multiArch is true 
When android:multiArch="true" in the <application> tag,
aapt dump badging should only output the 64-bit architecture
under the 'native-code' entry.

Other architectures will be emitted under the 'alt-native-code'
entry.

Bug:17061929
Change-Id: I8310b2388b06a2ed571e5e121e4989403082ba68
 2014-08-15 22:25:36 -07:00
Brian Carlstrom
4eedc1018f PackageInfo is a class, not a struct 
Change-Id: Ibb30e3a13fc086adec8077c8fb8fb17ef54c36b5
 2014-08-17 16:02:33 -07:00
Adam Lesinski
ad75122440 Include build number in aapt version 
Teams are constantly confused over which version of aapt
they are running. Include the build number from the
Android build system in the binary. Can be retrieved by executing
'aapt version'.

Change-Id: I9165c7d01f977344e143c2cb4dd963310ab28b72
 2014-08-18 23:42:21 +00:00
Deepanshu Gupta
a4ceb9e64c am 32faabbe: Layoutlib: Update wifi and battery icon for KK 
* commit '32faabbe14252397b35516caa9c0d0245bfcc719':
  Layoutlib: Update wifi and battery icon for KK
 2014-08-16 02:23:56 +00:00
Deepanshu Gupta
32faabbe14 Layoutlib: Update wifi and battery icon for KK 
Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
(cherry picked from commit 59eedf528ca29a32b6d7f358f5076929f8fbb164)
 2014-08-16 01:11:26 +00:00
Adam Lesinski
fe2ee96947 am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev 
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
  Add FeatureGroup to PackageInfo
 2014-08-16 00:44:55 +00:00
Adam Lesinski
99db87c1ba am afe71dba: am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit 'afe71dba4adb8ad8d07146a1d17211875b42c012':
  Fix assumption about DynamicRefTable in aapt
 2014-08-16 00:44:04 +00:00
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt 
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
 2014-08-15 14:01:43 -07:00
Adam Lesinski
91306bccf1 Merge "Add FeatureGroup to PackageInfo" into lmp-dev 2014-08-15 18:56:10 +00:00