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

882 Commits

Author SHA1 Message Date
Kenny Root
388432ac43 Merge "Change ZipFile flags anonymous enum" 2011-07-27 15:54:39 -07:00
Xavier Ducrohet
4f727fbdc3 am ed07215e: am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit 'ed07215e482cae1ffedbba707284821b3afc310f':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-25 17:24:56 -07:00
Kenny Root
af2872d1e3 Change ZipFile flags anonymous enum 
The arguments that ZipFile takes were apparently meant to be a typed
enum, but the name of the type was taken out because it creates invalid
conversion warnings in C++ since this is an invalid use of enum.

Just change the typedef enum to an anonymous enum so we get rid of the
compiler warnings. It will be implicitly converted to int instead.

Change-Id: Ie72c4c235c8f9ee8fd1b795e1010b77c55e983de
 2011-07-25 16:49:17 -07:00
Xavier Ducrohet
ed07215e48 am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit '55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-25 12:21:17 -07:00
Xavier Ducrohet
55775e5f34 am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit 'e70b2b8fe0c265171f3a367a66c99b36c62567c7':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:25:50 -07:00
Xavier Ducrohet
e70b2b8fe0 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:23:18 -07:00
Xavier Ducrohet
9bcf26ea7a Merge "Layoutlib_create flag -p: don't change all accesses to public." 2011-07-21 16:17:03 -07:00
Xavier Ducrohet
3a8801e059 am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
  Fix to compile for windows
 2011-07-20 18:56:52 -07:00
Xavier Ducrohet
b3ab070edb am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows
 2011-07-20 18:55:21 -07:00
Xavier Ducrohet
3a2d1c2351 am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
  Fix to compile for windows
 2011-07-20 18:53:08 -07:00
Xavier Ducrohet
ddb8e3b24b am 9bac0a9f: Merge "Fix to compile for windows" 
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
  Fix to compile for windows
 2011-07-20 18:49:46 -07:00
Josiah Gaskin
9102165fd8 Fix to compile for windows 
This change includes a workaround for dirent.h on windows not
including d_type.

Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
 2011-07-20 18:22:26 -07:00
Xavier Ducrohet
ac1fe6f846 am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp 
* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs
 2011-07-20 17:49:26 -07:00
Xavier Ducrohet
84be06e4ce resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp 
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
 2011-07-20 17:45:11 -07:00
Xavier Ducrohet
e53365f6f1 am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp 
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package
 2011-07-20 17:18:04 -07:00
Xavier Ducrohet
a125c937de resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp 
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
 2011-07-20 16:31:25 -07:00
Xavier Ducrohet
ea9e6d24a4 am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:02:33 -07:00
Xavier Ducrohet
b582af31c7 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:00:44 -07:00
Xavier Ducrohet
2c311be720 am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:27:39 -07:00
Xavier Ducrohet
3082449508 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:23:55 -07:00
Josiah Gaskin
8a39da80b3 Added Caching for PreProcessed PNGs 
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.

Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
 2011-07-20 15:20:26 -07:00
Raphael Moll
caed59d90d Layoutlib_create flag -p: don't change all accesses to public. 
Change-Id: Icb1709ed0cb275a5a51ca34030695a5e94091499
 2011-07-19 22:36:13 -07:00
Xavier Ducrohet
af64556de0 Layoutlib: misc fix + start of AndroidBidi support. 
Change-Id: If2ce0b683da8cce01679322d503eed8dd474e521
 2011-07-19 15:10:23 -07:00
Xavier Ducrohet
c810fffe1f am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:23:19 -07:00
Xavier Ducrohet
e242042b81 am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e':
  Copy once-created R.java into library projects
 2011-07-19 10:23:16 -07:00
Xavier Ducrohet
9139868b6c am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:18:28 -07:00
Xavier Ducrohet
bf31250ba0 am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects
 2011-07-19 10:18:25 -07:00
Xavier Ducrohet
ba6c98db8f am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:15:11 -07:00
Xavier Ducrohet
d5431ed550 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12':
  Copy once-created R.java into library projects
 2011-07-19 10:15:09 -07:00
Xavier Ducrohet
82943ecfe2 am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:10:17 -07:00
Xavier Ducrohet
2e659ae59c am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
  Copy once-created R.java into library projects
 2011-07-19 10:10:15 -07:00
Josiah Gaskin
03589cc653 Add generation of dependency file for .ap_ package 
Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.

Change-Id: I763679414daf76369700aa599c26dcf78d4de099
 2011-07-18 16:37:55 -07:00
satok
91e88122cf Enable IMEs to set additional subtypes in background 
Bug: 4591792

Change-Id: I7e61a576c56d1a3a56001bdf2fd51ad3801add01
 2011-07-19 04:59:48 +09:00
Elliott Hughes
49062e3b4c Merge "Fix aidl to cope with multiple collection types per method." 2011-07-14 13:28:00 -07:00
Xavier Ducrohet
37b3cc3bbe am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. 
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.
 2011-07-13 14:53:54 -07:00
Elliott Hughes
b9eba866b2 Fix aidl to cope with multiple collection types per method. 
Bug: http://code.google.com/p/android/issues/detail?id=18497
Change-Id: I152416022524d2860cb16b46c4812c5be6bdcbad
 2011-07-13 12:10:30 -07:00
Xavier Ducrohet
96131eef38 LayoutLib: updated fake accessbility manager and ensure there's an InputMethodManager 
We had replaced the accessibility Manager but it lacked some new API. Obvisouly
this is fragile and should be fixed, but this works for now.

After fixing this there was another issue with the lack of InputMethodManager.
To fix this I had to create an implementation of IInputMethodManager which
normally comes from a binder object.

I may want to do a similar trick with the accessibility manager later.

Change-Id: I28c6494e333f39072f348d0199124efac93256a5
 2011-07-12 12:35:50 -07:00
Xavier Ducrohet
0a49635b17 LayoutLib: Delegate for Display and IWindowManager implementation. 
This allows ViewConfiguration to be properly implemented which is now
required for the rendering to happen.

Change-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4
 2011-07-12 11:49:22 -07:00
Xavier Ducrohet
77eaa10949 new button graphics for layoutlib. 
Change-Id: I12a6bf9df87552321452ca3344449814cd3102bb
 2011-07-11 14:40:48 -07:00
Xavier Ducrohet
9163a4a686 am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1. 
* commit 'aa4b1d8ba9d5e317b67638b764d92d17fb810aa0':
  Merge 36a3a392 from mr1.
 2011-07-11 12:46:07 -07:00
Xavier Ducrohet
d292d2a031 Merge 36a3a392 from mr1. 
Protect against OOB index in BridgeTypedArray.

Change-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c
 2011-07-11 12:02:51 -07:00
Xavier Ducrohet
842725fc64 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 18:55:46 -07:00
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:53:54 -07:00
Josiah Gaskin
9bf34ca6f8 Add dependency generation to Aapt for R.java 
Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.

Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
 2011-06-27 16:44:57 -07:00
Josiah Gaskin
ce89f1531e Copy once-created R.java into library projects 
This change adds functionality in Aapt to allow specification of
library projects to copy the generated R.java file into rather
than regenerating the file for each library project.

Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
 2011-06-27 16:29:38 -07:00
Raphael Moll
b02367778d am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'f9705ef6d3f1502991dd312bfdbfb93cb07fe672':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-23 14:30:25 -07:00
Raphael Moll
f9705ef6d3 am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit '2b5f2d01558ba338042f486c754f63873c4061fe':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 18:05:22 -07:00
Raphael Moll
2b5f2d0155 am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." 
* commit 'e2b41b0d5c8db85a60cd190c7094052db61114b2':
  Laoutlib_creator: keep original of delegate methods.
 2011-06-22 17:44:29 -07:00
Brian Carlstrom
98e1e18c1c Fix build. 
git cherry-pick --no-commit  22a614142aacce13fc46a0e524dbfb6ca56bf237

Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83
 2011-06-22 11:35:11 -07:00