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

80569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2e6428668c am be676b6c: am 4a5425db: fix layout bug 
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
  fix layout bug
 2012-09-21 16:00:51 -07:00
Scott Main
be676b6cc4 am 4a5425db: fix layout bug 
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
  fix layout bug
 2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2 fix layout bug 
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
 2012-09-21 15:55:15 -07:00
Victoria Lease
4feac67048 am 7c0edba0: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 
* commit '7c0edba0ab8803ff63ac006c8aead4fa0d1a15d8':
  Get your own cursor Drawables, WebViewClassic!
 2012-09-20 16:43:25 -07:00
Joe Fernandez
c098ff668b am bbdfada0: Merge "docs: Systrace tool documentation" into jb-dev 
* commit 'bbdfada0a97b779bde0c43b63979bf7edb94d94d':
  docs: Systrace tool documentation
 2012-09-20 16:43:21 -07:00
Jean-Baptiste Queru
fea72d3b1a Ignore 12496bfc into jb-dev-plus-aosp 
Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a
 2012-09-20 16:33:09 -07:00
Victoria Lease
7c0edba0ab Merge "Get your own cursor Drawables, WebViewClassic!" into jb-dev 2012-09-20 15:19:06 -07:00
Joe Fernandez
bbdfada0a9 Merge "docs: Systrace tool documentation" into jb-dev 2012-09-20 15:13:01 -07:00
Victoria Lease
ae2d7324a4 Get your own cursor Drawables, WebViewClassic! 
These are shared resources! You can't just animate *everyone's*
cursors!

Bug: 7110290
Change-Id: Icdc86af4fba427a352019cd3e2017f97a3b9fdba
 2012-09-20 15:09:24 -07:00
Xavier Ducrohet
12496bfc3b Merge "Add --output-text-symbols option to aapt. do not merge." into jb-dev 2012-09-20 13:56:09 -07:00
Joe Fernandez
5e3a1c091f docs: Systrace tool documentation 
Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7
 2012-09-20 12:59:45 -07:00
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:21:15 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 11:56:40 -07:00
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
 2012-09-19 11:22:02 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB 
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
 2012-09-19 00:02:12 -07:00
Xavier Ducrohet
f43f5c7aaa Add --output-text-symbols option to aapt. do not merge. 
Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Chery-picked from f5de650ff1e161ea135c828e43515895343d2c0f

Change-Id: I0e08ceb6e4ceb3feb169ce17df21dd35a2505e7f
 2012-09-18 17:02:34 -07:00
Mike Lockwood
ad23333f72 am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 10:59:27 -07:00
Mike Lockwood
945080b5b6 am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 10:53:11 -07:00
Scott Main
a59b1dacd7 am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit 'edf0ba6e1b6de8f43880267862e43ee461901c25':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-18 10:45:23 -07:00
Scott Main
3ce6b0085a am d67459ff: new Google Play badges and some updates to corresponding pages 
* commit 'd67459ff191aaee34d5459960ef8e1fed82f59d5':
  new Google Play badges and some updates to corresponding pages
 2012-09-18 10:45:19 -07:00
Scott Main
fe7e473d05 am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit 'b574a264e687385a236a42d3c95d00825845c820':
  small update to the ADT installation steps based on new ADT UI
 2012-09-18 10:45:15 -07:00
Katie McCormick
04afdd68f3 am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit 'ad4bbdf22cc63489b541b9b8f82073e851836780':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-18 10:45:11 -07:00
Scott Main
6c47d0a9ff am ada4f081: am 61d85c43: add link to device dock lesson 
* commit 'ada4f081c641b09f7e3a3c214db868f24df957e9':
  add link to device dock lesson
 2012-09-18 10:45:07 -07:00
Dirk Dougherty
880051db77 am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '2dec992884db8ca54ee814b4c7967c358dcd8212':
  Doc change: fix typo in JB highlights.
 2012-09-18 10:45:04 -07:00
Scott Main
08ec998bb3 am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
  docs: update for multi apk doc for ABI support
 2012-09-18 10:45:00 -07:00
Katie McCormick
0a94b84def am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '917d45e3d1a2d405aa0996889c40554b4a508fe1':
  Doc update: Appwidgets JB additions.
 2012-09-18 10:44:57 -07:00
Scott Main
21c5007ed4 am 8a80ac46: am 54efa69f: older not lower 
* commit '8a80ac469050135ce2c126bc690e352522b7cee3':
  older not lower
 2012-09-18 10:44:53 -07:00
Joe Fernandez
77ae2e6f27 am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 10:44:50 -07:00
Scott Main
db6313ceba am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 10:44:46 -07:00
Katie McCormick
f5c717a96c am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit '2141c06849cb5b2f5bea06a79de66b7de4112ac9':
  Doc update: Fix typo.
 2012-09-18 10:44:42 -07:00
Scott Main
5c97d966cc am 9ae01846: fix broken link for action bar pack 
* commit '9ae018462a5fa44e3e1d4837942b5fd880531124':
  fix broken link for action bar pack
 2012-09-18 10:44:32 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Jean-Baptiste Queru
7f5de0161b Skip f5cbd762 - it's in frameworks/opt/telephony 
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
 2012-09-18 08:01:17 -07:00
Scott Main
edf0ba6e1b am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit '442040208cba3be464d7a180283d72d9ec074def':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-17 21:30:16 -07:00
Scott Main
442040208c cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 
new Google Play badges and some updates to corresponding pages

Change-Id: I8502a47b9d79d9a03a51c7baaacaa454fd63e5a5
 2012-09-17 21:28:14 -07:00
Scott Main
d67459ff19 new Google Play badges and some updates to corresponding pages 
Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468
 2012-09-17 14:15:34 -07:00
Xavier Ducrohet
79c95c3b50 am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '5de9603529ee01a416b5fa31074197565fde4482':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:05:36 -07:00
Xavier Ducrohet
8a67598eb7 am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'cc9747ed45302956a3ec9dd21f7b950b837dbfdd':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:05:30 -07:00
Xavier Ducrohet
5de9603529 am 31820a35: Merge "Add --output-text-symbols option to aapt." 
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.
 2012-09-17 12:03:19 -07:00
Xavier Ducrohet
cc9747ed45 am d7252571: Merge "Add --error-on-failed-insert option to aapt." 
* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.
 2012-09-17 12:03:12 -07:00
Scott Main
b574a264e6 am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit 'b86b7f07d79cae32cda710aa9cc328e7af2c8ccc':
  small update to the ADT installation steps based on new ADT UI
 2012-09-17 11:23:20 -07:00
Katie McCormick
ad4bbdf22c am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '844d2a942ebde7eb1d5abd68505c7a2eb7e2db0a':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-17 11:21:51 -07:00
Scott Main
ada4f081c6 am 61d85c43: add link to device dock lesson 
* commit '61d85c43474da17296b90b3d7fd0f4bd34cdebe8':
  add link to device dock lesson
 2012-09-17 11:21:48 -07:00
Dirk Dougherty
2dec992884 am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '24a024ecaf949601b998a4b0ed3b4d7af6bcd8ba':
  Doc change: fix typo in JB highlights.
 2012-09-17 11:20:19 -07:00
Scott Main
a1981bc1ab am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'd5abc5586e08bedf06f337aefa5a59c014fb7a2e':
  docs: update for multi apk doc for ABI support
 2012-09-17 11:20:16 -07:00
Katie McCormick
917d45e3d1 am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '73ec048e4de50419d2d49907be0acae0893f92ca':
  Doc update: Appwidgets JB additions.
 2012-09-17 11:20:12 -07:00
Scott Main
8a80ac4690 am 54efa69f: older not lower 
* commit '54efa69f5074568f23eb5ff7f15022eece11918c':
  older not lower
 2012-09-17 11:20:09 -07:00
Joe Fernandez
b9b05dfcc1 am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit '8982939d17881c7dcd20459955f3bfcec6e05905':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-17 11:20:06 -07:00