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

1577 Commits

Author SHA1 Message Date
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00: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
The Android Open Source Project
dbccd44a63 Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD 
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
 2013-11-22 11:18:57 -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
Deepanshu Gupta
a741163d61 am 4567ec02: am ca429e08: am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib. 
* commit '4567ec02c468423351c56bcc587032577004735d':
  Fix DatePicker and Calendar widget in layoutlib.
 2013-10-17 09:14:54 -07:00
Deepanshu Gupta
e636469fb5 am a30efb5b: am 198537c2: am 7dc35060: am df076962: am 1cf5df38: Layoutlib Create: Remove references to non-std Java classes. 
* commit 'a30efb5b7034236020bcb1ef4787f1517f7995df':
  Layoutlib Create: Remove references to non-std Java classes.
 2013-10-17 09:14:51 -07:00
Deepanshu Gupta
4fc655dd03 am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev 
* commit '873c76d0475def6f89fe02458828a549a7a7b5a2':
  Fix CalendarView to show the right month and year label.
 2013-10-17 09:09:19 -07:00
Deepanshu Gupta
38d097b6d1 am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev 
* commit '92a80b1830082d109be4902c357424535305130d':
  Layoutlib: Update the wifi icon in the status bar.
 2013-10-17 09:09:16 -07:00
Deepanshu Gupta
ca429e08fe am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib. 
* commit '9568ad393194cbd42866e64dada88207b44462a6':
  Fix DatePicker and Calendar widget in layoutlib.
 2013-10-17 09:09:12 -07:00
Deepanshu Gupta
198537c22c am 7dc35060: am df076962: am 1cf5df38: Layoutlib Create: Remove references to non-std Java classes. 
* commit '7dc35060a828c473dcc75d13d31edaa75768a40f':
  Layoutlib Create: Remove references to non-std Java classes.
 2013-10-17 09:09:08 -07:00
Deepanshu Gupta
873c76d047 am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev 
* commit 'fb1ee08ca4424969c148760937d18ec0e3de206c':
  Fix CalendarView to show the right month and year label.
 2013-10-17 09:06:46 -07:00
Deepanshu Gupta
92a80b1830 am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev 
* commit '9b827a7d6dcb8c60411a24e2c8970f3fc24f0380':
  Layoutlib: Update the wifi icon in the status bar.
 2013-10-17 09:06:42 -07:00
Deepanshu Gupta
9568ad3931 am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib. 
* commit '94e5ada7d629f125262fcc052cf15355a34a678a':
  Fix DatePicker and Calendar widget in layoutlib.
 2013-10-17 09:06:39 -07:00
Deepanshu Gupta
7dc35060a8 am df076962: am 1cf5df38: Layoutlib Create: Remove references to non-std Java classes. 
* commit 'df0769628e2bfcefb5f78375b74775b3a825ca9f':
  Layoutlib Create: Remove references to non-std Java classes.
 2013-10-17 09:06:34 -07:00
Deepanshu Gupta
a49c358576 Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev 2013-10-17 16:01:08 +00:00
Deepanshu Gupta
ec55590216 Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev 2013-10-17 16:00:57 +00:00
Deepanshu Gupta
39e7583539 Fix layoutlib for KK 
Fix a NPE, update the native methods for NinePatch and update an ICU
method to return the right value as required by DatePicker widget.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
 2013-10-16 21:49:02 -07:00
Deepanshu Gupta
81f74f4bc9 Fix DatePicker and Calendar widget in layoutlib. 
Issue: https://code.google.com/p/android/issues/detail?id=59732
Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
 2013-10-16 15:09:52 -07:00
Deepanshu Gupta
083e3caf66 Fix CalendarView to show the right month and year label. 
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
 2013-10-16 15:09:52 -07:00
Deepanshu Gupta
1cf5df38f4 Layoutlib Create: Remove references to non-std Java classes. 
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.

Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
 2013-10-16 15:09:50 -07:00
Adam Lesinski
9438c2df13 Prune unneeded density resources from APK 
When a preferred density is specified, prune all but the
closest matching density when the exact density resource does not
exist.

If a preferred density resource does not exist and a higher density
resource exists, prune all but the resource with the next highest
density relative to the preferred density.

If a preferred density resource does not exist and there is no
higher density resource, prune all but the resource with the next
lowest density relative to the preferred density.

bug:11224465
Change-Id: I99b3950fe3d8116a5625968ed383442315ae8526
 2013-10-15 17:18:51 -07:00
Deepanshu Gupta
9cb5f5b523 Layoutlib: Update the wifi icon in the status bar. 
Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
 2013-10-14 10:35:46 -07:00
Alan Viverette
e4ccb864e8 am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 
* commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb':
  Ignore certain WindowManager flags when touch exploration is enabled
 2013-10-07 17:54:42 -07:00
Alan Viverette
6930d3805e Merge "Ignore certain WindowManager flags when touch exploration is enabled" into klp-dev 2013-10-08 00:47:23 +00:00