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

1597 Commits

Author SHA1 Message Date
Adam Lesinski
1b5b60d696 am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
  Add support for multiple asset dirs (-A)
 2014-02-04 18:36:10 +00:00
Adam Lesinski
203356a34a Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev 2014-02-04 18:31:23 +00:00
Narayan Kamath
d49babe50d am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.
 2014-01-31 16:29:19 +00:00
Narayan Kamath
7c4887f66b Change ResourceType cookies to int32_t. 
Also change the order of parameters in ResTable constructors
to avoid ambiguity.

(cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)

Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
 2014-01-31 13:47:27 +00:00
Narayan Kamath
5cdbac1e44 am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-31 12:17:09 +00:00
Narayan Kamath
98ac6c79a4 resolved conflicts for merge of cb7cdd50 to klp-modular-dev-plus-aosp 
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
 2014-01-31 12:08:17 +00:00
Narayan Kamath
ab71f8b68f Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-30 10:37:12 +00:00
Narayan Kamath
40582000e0 Fix a few more delegate methods in layoutlib. 
Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
 2014-01-29 15:05:03 +00:00
Ashok Bhat
0141e88434 AArch64: Use of long for pointers in PropertyValuesHolder 
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.

Change-Id: Ifb514fc8473d7c41c0d6194fc6eb85d4816b2cd9
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-29 10:47:27 +00:00
Narayan Kamath
8773d51eae resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp 
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
 2014-01-28 19:47:58 +00:00
Narayan Kamath
84151432e7 Track 64bit changes to android/graphics. 
All pointers are now 64bits wide, so should be
represented as java longs and not ints.

Also changed DelegateManager and SparseWeakArray to
reflect the new world order.

(cherry picked from commit 88a8364c386c694f7ad56662ef89713dbf7c9d63)

Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
 2014-01-28 17:56:12 +00:00
Narayan Kamath
ebd43d46eb am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'dff83e2b121b356a264e908f8a7d64584eab9b73':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 04:01:15 -08:00
Narayan Kamath
745d4efc83 AssetManager cookies should be int32_t and not void*. 
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)

Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
 2014-01-27 11:20:24 +00:00
Adam Lesinski
09384303de Add support for multiple asset dirs (-A) 
Bug: 12608034
Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
 2014-01-23 12:43:42 -08:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Narayan Kamath
336bf2fb49 am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive." 
* commit 'd21752dff45c7d8856e63026cfddc303a302df14':
  Reimplement ZipFileRO in terms of libziparchive.
 2013-12-11 03:45:58 -08:00
Narayan Kamath
d21752dff4 Merge "Reimplement ZipFileRO in terms of libziparchive." 2013-12-11 11:41:10 +00:00
Narayan Kamath
7e1b8ff3e1 Don't pseudolocalize untranslatable strings. 
bug: https://code.google.com/p/android/issues/detail?id=63004
Change-Id: I8e47a53d887144dc867111e42313d0e113b83ea1
 2013-12-10 13:37:32 +00:00
Narayan Kamath
afd31e0829 Reimplement ZipFileRO in terms of libziparchive. 
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
 2013-12-09 16:23:16 +00:00
Xavier Ducrohet
1d3205f62a am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into klp-dev 
* commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e':
  Update delegate methods in layoutlib.
 2013-11-26 17:58:26 -08:00
Deepanshu Gupta
24541255c3 Update delegate methods in layoutlib. 
Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
 2013-11-25 19:59:54 -08:00
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD 
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
 2013-11-22 11:18:57 -08:00
Deepanshu Gupta
bdfa8a1ae0 am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 
* commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07':
  Update ICU_Delegate methods. DO NOT MERGE
 2013-11-18 16:25:04 -08:00
Deepanshu Gupta
0baec410c2 Update ICU_Delegate methods. DO NOT MERGE 
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
 2013-11-18 10:20:37 -08:00
Deepanshu Gupta
5b95025059 am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:15:44 -08:00
Deepanshu Gupta
f6ee080570 am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '42453ede3335aa5f7007a5b36749e84df83a08d4':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:15:40 -08:00
Deepanshu Gupta
f7400aa1da am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
* commit '6870d29c340008919dcd9e547236b74301b3b9ef':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
 2013-11-13 08:43:34 -08:00
Deepanshu Gupta
1f92d7fc0f Add libphonenumber to layoutlib.jar. DO NOT MERGE 
Issue: http://b.android.com/59497
Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
 2013-11-13 18:15:51 +05:30
Deepanshu Gupta
d0581d271e Fix NPE in layoutlib. DO NOT MERGE 
Change-Id: I36623304d83b344ea078044001577b8005a63c02
 2013-11-13 18:15:51 +05:30
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE 
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
 2013-11-13 18:15:51 +05:30
Craig Mautner
bf581034f9 am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev 
* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.
 2013-11-12 16:00:54 -08:00
Craig Mautner
5d9f547720 Relayout windows that handle their own config change. 
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
 2013-11-12 14:02:52 -08:00
Deepanshu Gupta
35631bccd4 am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev 
* commit '76b715e556a110d4aa1fec0d4de195e18def8295':
  Fix text size in Fake Action Bar
 2013-11-10 22:54:13 -08:00
Deepanshu Gupta
f4800bc3b1 Fix text size in Fake Action Bar 
The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
 2013-11-08 16:43:07 +05:30
Elliott Hughes
ed84dea928 am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:35:04 -07:00
Elliott Hughes
8f592378a1 am 69920427: Merge "Fix a variety of small publicly-reported bugs." 
* commit '69920427ea01421d34f3a7576bdd135527b20859':
  Fix a variety of small publicly-reported bugs.
 2013-10-29 13:32:33 -07:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs. 
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
 2013-10-29 13:12:55 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev 
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
 2013-10-25 15:01:34 -07:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock 
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
 2013-10-25 12:49:55 -07:00
Adam Lesinski
91b47365f6 am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" into klp-dev 
* commit '16e8c4f7db87d743410751410c7f761350792fe2':
  Prune unneeded density resources from APK
 2013-10-18 13:45:19 -07:00
Adam Lesinski
7d292145f1 Merge "Prune unneeded density resources from APK" into klp-dev 2013-10-18 20:36:58 +00:00
Deepanshu Gupta
02b6e6b191 am 5a6541eb: am b4f33d8f: Merge "Layoutlib Create: Remove references to java package class Objects." into klp-dev 
* commit '5a6541ebc787c5a54e89c0bf65f029660778736a':
  Layoutlib Create: Remove references to java package class Objects.
 2013-10-18 13:09:58 -07:00
Deepanshu Gupta
45f5cd49fa Layoutlib Create: Remove references to java package class Objects. 
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.

Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
 2013-10-17 20:06:44 -07:00
Deepanshu Gupta
d32ebf5744 am ddc069cb: am 6c3a638d: Merge "Fix layoutlib for KK" into klp-dev 
* commit 'ddc069cbb0a7edd289f4920ab42dca7e8111a359':
  Fix layoutlib for KK
 2013-10-17 19:13:23 -07:00
Deepanshu Gupta
188d519ec5 am e1abede3: am 29cf698d: Merge "Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView" into klp-dev 
* commit 'e1abede32fc913098b7c449e3369eb1d5bda77e2':
  Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView
 2013-10-17 19:13:19 -07:00
Deepanshu Gupta
6c3a638dd8 Merge "Fix layoutlib for KK" into klp-dev 2013-10-18 02:07:30 +00:00
Deepanshu Gupta
272d1bce79 Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView 
Change-Id: Ica79267a4eb231db833cb0232cfacf419fe73de3
 2013-10-17 11:28:48 -07:00
Deepanshu Gupta
814ea4f8fd am 0b447eb8: am 4fc655dd: am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev 
* commit '0b447eb8c68769333228791d077e1bdf8779f22f':
  Fix CalendarView to show the right month and year label.
 2013-10-17 09:15:01 -07:00
Deepanshu Gupta
6db169c249 am c9f65589: am 38d097b6: am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev 
* commit 'c9f65589a98ae348d2d31296bda4d739e8515335':
  Layoutlib: Update the wifi icon in the status bar.
 2013-10-17 09:14:58 -07:00