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

2551 Commits

Author SHA1 Message Date
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
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
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
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo 
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
 2014-08-15 15:53:35 -07:00
Chris Craik
3139daa33c am b808f42b: am 1458bc7c: am 36531e51: Merge "Fix nine patch outline radius computation" into lmp-dev 
* commit 'b808f42b6e67c1a6f09ec1dac3d10f0d6bbcfb30':
  Fix nine patch outline radius computation
 2014-08-15 13:38:29 +00:00
Adam Lesinski
a101db1b18 am 2dc6a265: am f475f1df: am dd4c3af1: Merge "Ensure that split names are valid" into lmp-dev 
* commit '2dc6a26529c58aec4501e0da27fbd339142ca113':
  Ensure that split names are valid
 2014-08-15 11:44:26 +00:00
Jorim Jaggi
02fb6dc882 am 0bd7f533: am ddf03adb: am 8cadb460: Use different unlock animation when going to full shade 
* commit '0bd7f533c128f6c0586f56bc8a29cd266b23fa29':
  Use different unlock animation when going to full shade
 2014-08-14 23:42:53 +00:00
Deepanshu Gupta
61a7ebf09f am 0fe8ab0c: am 7e1ba550: am 848c83b2: Merge "Update intelliJ copyright profile" into lmp-dev 
* commit '0fe8ab0c94cb87fd5b21c1a36469897dacaf7cd7':
  Update intelliJ copyright profile
 2014-08-14 17:56:18 +00:00
Deepanshu Gupta
470a650164 am 514c35fa: am 87267e4a: am 40748a08: Merge "Add KitKat wifi and battery icons." into lmp-dev 
* commit '514c35fa6d4eeb2517d1850cd8ffceeb8ae24837':
  Add KitKat wifi and battery icons.
 2014-08-14 17:56:11 +00:00
Deepanshu Gupta
3c33915e3c am c285cd8f: am da1101ec: am 6f5604a6: Merge "Whitelist fonts instead of blacklist." into lmp-dev 
* commit 'c285cd8fdd64563e722bbe6cbb11cf64d3e6adca':
  Whitelist fonts instead of blacklist.
 2014-08-14 17:56:05 +00:00
Chris Craik
47d8623082 Fix nine patch outline radius computation 
bug:16852714
Change-Id: I475154c0f324fd2e2c8991415e0d8240c75663d8
 2014-08-15 00:41:09 +00:00
Adam Lesinski
6240840387 Ensure that split names are valid 
Generate valid split names for resource splits.
Validate split names for features.

Change-Id: I3040438af0156778c2bd66ddeffdf62fe9dcc9fc
 2014-08-14 19:29:47 +00:00
Jorim Jaggi
84a3e7aacf Use different unlock animation when going to full shade 
Also fixes a bug that the notify flag was not reset, and fix the
transition for the phone/camera affordance (in these cases, no
animation is needed).

Bug: 15991916
Change-Id: Idbb4fa40f86bda597cd66cc38da838ef4f75514d
 2014-08-14 12:29:25 +00:00
Deepanshu Gupta
a3a3775599 Merge "Update intelliJ copyright profile" into lmp-dev 2014-08-14 00:12:29 +00:00
Deepanshu Gupta
aabf346d44 Merge "Add KitKat wifi and battery icons." into lmp-dev 2014-08-14 00:12:29 +00:00
Deepanshu Gupta
84cc05cacd Add KitKat wifi and battery icons. 
This adds wifi and battery icons for Gingerbread and KitKat. This also
improves the icon resolution code by extracting it out in its own class.
The resources are now organized such that each API level resource
directory is used as a backup for all API levels lower than itself.

Change-Id: I937c83638adcc9fa8cd407e0a3023c3abe95530d
 2014-08-13 23:13:33 +00:00
Deepanshu Gupta
2e7a0355b4 Update intelliJ copyright profile 
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
 2014-08-13 22:52:02 +00:00
Deepanshu Gupta
497f6a1c98 Merge "Whitelist fonts instead of blacklist." into lmp-dev 2014-08-12 23:14:35 +00:00
Adam Lesinski
59412b26ca am 63e8262c: am 64a1f02f: am f7ef8b35: Merge "AAPT: Dump an APK\'s split name attribute" into lmp-dev 
* commit '63e8262ce1ee1e9b1d94af8692583d0d6e463bf6':
  AAPT: Dump an APK's split name attribute
 2014-08-12 22:36:25 +00:00
Deepanshu Gupta
0e4be25409 Whitelist fonts instead of blacklist. 
A list of all fonts bundled with the SDK is generated. Load this file to
know which fonts are missing from the SDK.

Change-Id: I1554f1baec842ccdde3b21a93008437e9bac9353
 2014-08-12 15:00:58 -07:00
Adam Lesinski
25d35a9d68 AAPT: Dump an APK's split name attribute 
Bug:16919497

Change-Id: I109e21bff9e4a64a10f48dce7f2d41102b32ee1d
 2014-08-12 22:17:25 +00:00
Deepanshu Gupta
14690b0aa3 Merge "Improve error reporting when renaming fonts." into lmp-dev 2014-08-12 16:54:46 +00:00
Deepanshu Gupta
83cc0c896e am 03b0933a: am 49c65571: am ffd4e5ba: Merge "Improve error reporting when renaming fonts." into lmp-dev 
* commit '03b0933ad0b53a88132e37f4b5978d020c3f786c':
  Improve error reporting when renaming fonts.
 2014-08-12 17:30:23 +00:00
Deepanshu Gupta
1e8cd277ed am 2b369a27: am 9af6315e: am 266828ff: Merge "Don\'t show warnings for fonts not bundled." into lmp-dev 
* commit '2b369a27d24b8d5d85626e179326655bcdb5a65c':
  Don't show warnings for fonts not bundled.
 2014-08-12 17:30:17 +00:00
Deepanshu Gupta
ddeb8a4f20 am cf3c4d16: am 3dc1de43: am a061e080: Merge "Resolve color xml attributes properly." into lmp-dev 
* commit 'cf3c4d16be70456f9e4fd7e092d55b3d03c35a99':
  Resolve color xml attributes properly.
 2014-08-12 17:30:13 +00:00
Deepanshu Gupta
556f941f55 Merge "Don't show warnings for fonts not bundled." into lmp-dev 2014-08-12 16:54:46 +00:00
Deepanshu Gupta
93b1483e57 Improve error reporting when renaming fonts. 
Log a better error in case of invalid input.

Change-Id: Ifb122c1cc624111769e650439aa24290155dbbc4
 2014-08-11 18:48:53 -07:00
Deepanshu Gupta
e644ff8d92 Don't show warnings for fonts not bundled. 
The extended font set, used on Nexus 5, new Nexus 7 etc., uses OpenType
CFF fonts which don't work well with Java. These fonts are deliberately
excluded from the SDK build.

This change skips the warnings for the missing fonts. However, we still
show warnings for other fonts that failed to load. If the set of fonts
bundled with the SDK changes, we will need to update the list of missing
fonts in FontFamily_Delegate.java.

Change-Id: I3197b5350d048daa09512e8024188909179b1799
 2014-08-11 18:11:37 -07:00
Deepanshu Gupta
99d90a6210 Resolve color xml attributes properly. 
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
 2014-08-12 09:57:27 -07:00
Adam Lesinski
f23e6bd45f am 46d239e7: am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '46d239e7c2d39cfc62262315c22df78f7497120f':
  AAPT support for feature splits
 2014-08-09 04:21:03 +00:00
Adam Lesinski
ec64709ce0 Merge "AAPT support for feature splits" into lmp-dev 2014-08-09 00:40:15 +00:00