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

111698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
c1acf7994a am 243a026b: Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev 
* commit '243a026b89bfe0b7b549665882d053c40ab0785f':
  Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089
 2013-08-21 20:11:46 -07:00
Eino-Ville Talvala
1de3ac6463 am d5ea6e11: Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev 
* commit 'd5ea6e113cfd573859f0966ae71cdcfd3d5e5f51':
  Camera1: Rename setPreviewTexture to ...Target for clarity
 2013-08-21 20:11:18 -07:00
Yorke Lee
35785bfdd1 Remove dialpad_autocomplete system key from settings 
Bug: 10429771
Change-Id: I6c3721020114733e20d0d620680839e1b958721f
 2013-08-21 19:21:25 -07:00
Fabrice Di Meglio
1c9c926a36 Merge "Decouple TimePicker code" 2013-08-22 01:57:25 +00:00
Fabrice Di Meglio
9e4009ea15 Decouple TimePicker code 
- introduce a TimePickerDelegate interface to be able to have several
TimePicker implementations
- code refactoring

Change-Id: I0d8bdfdb4c2723a51311c01fbd485e34983bb423
 2013-08-21 18:47:04 -07:00
Romain Guy
243a026b89 Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev 2013-08-22 01:43:24 +00:00
Romain Guy
5d92320084 Second attempt at avoiding infinite loop in PathCache::trim() 
Bug #10347089

Change-Id: I70f5a3933e848632473acc6636c88be5dc6ac430
 2013-08-21 18:42:46 -07:00
Maurice Chu
681c4f45bf Modify 'aapt dump badging' to output <meta-data> tags 
This enables output of <meta-data> tags within the <application>
element of the AndroidManifest.xml if the --include-meta-data
command line option is invoked.  For example, by

  aapt dump --include-meta-data badging Foo.apk

Bug: 10257318
Change-Id: I88da1a14ab21146b64ac947e0eeb1107816acd4d
 2013-08-21 18:06:50 -07:00
Eino-Ville Talvala
d5ea6e113c Merge "Camera1: Rename setPreviewTexture to ...Target for clarity" into klp-dev 2013-08-22 00:50:55 +00:00
Romain Guy
880d6fecfc am b7db6d73: am e0a2435c: Merge "Properly account for created paths in the cache" into klp-dev 
* commit 'b7db6d73a4a7fc2c2ec189780e1532cb0e2c638b':
  Properly account for created paths in the cache
 2013-08-21 17:42:26 -07:00
Romain Guy
b7db6d73a4 am e0a2435c: Merge "Properly account for created paths in the cache" into klp-dev 
* commit 'e0a2435cb390c4333e3d40ede4d163566d779962':
  Properly account for created paths in the cache
 2013-08-21 17:38:45 -07:00
Romain Guy
e0a2435cb3 Merge "Properly account for created paths in the cache" into klp-dev 2013-08-22 00:36:33 +00:00
Romain Guy
0a8c51b1d0 Properly account for created paths in the cache 
Change-Id: I47b89b3085cefab6daac9194e7bfd3c140b37fa2
 2013-08-21 17:35:38 -07:00
Jeff Tinker
7cda491321 Add ability to test supported content types to MediaDrm 
bug: 10244066
Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
 2013-08-21 17:30:06 -07:00
David Christie
4c18b585e4 Remove newly added but deprecated master switch location setting methods. 
Change-Id: I5e85a1efafe45cee89e08b97a0dcb016c91fd572
 2013-08-21 17:09:30 -07:00
Elliott Hughes
c63d85a051 am 3558cce0: am f4799069: Merge "The VM handles blocking SIGPIPE." into klp-dev 
* commit '3558cce0d2ed91603254897f0c3a68a4ba5f1345':
  The VM handles blocking SIGPIPE.
 2013-08-21 17:03:24 -07:00
Elliott Hughes
3558cce0d2 am f4799069: Merge "The VM handles blocking SIGPIPE." into klp-dev 
* commit 'f479906939ad463feb50a3edaabb2aa77d100723':
  The VM handles blocking SIGPIPE.
 2013-08-21 16:59:58 -07:00
Elliott Hughes
f479906939 Merge "The VM handles blocking SIGPIPE." into klp-dev 2013-08-21 23:57:59 +00:00
Jonathan Dixon
b7d5cbc007 Reset the Experimental WebView property per build 
In order to increase test coverage, reset to the default value everytime
the build ID changes.

Bug: 10427705
Change-Id: I75e301d26ee0ca52265c5f7fe48661787b596168
 2013-08-21 16:51:29 -07:00
Sam Blitzstein
b86c79a781 am f85d7516: am 21ea2d03: Fix VALUE_RINGTONE_SILENT ref. 
* commit 'f85d7516c038fe58369915487b855c6bacb85aef':
  Fix VALUE_RINGTONE_SILENT ref.
 2013-08-21 16:14:43 -07:00
Sam Blitzstein
f85d7516c0 am 21ea2d03: Fix VALUE_RINGTONE_SILENT ref. 
* commit '21ea2d0387e07569b3448c1161a3276599b3fbba':
  Fix VALUE_RINGTONE_SILENT ref.
 2013-08-21 16:12:19 -07:00
Elliott Hughes
d7a90ca50c The VM handles blocking SIGPIPE. 
We don't need this any more.

Bug: 10211309

(cherry picked from commit 437e76208d451e7954699ead8931d0fe147bb07d)

Change-Id: I97b3ab4f65a70eacca2fbe95cfb11b1cc85c4021
 2013-08-21 16:08:29 -07:00
Sam Blitzstein
21ea2d0387 Fix VALUE_RINGTONE_SILENT ref. 
Change-Id: I115c8d2e0e972f6d7d732071d26ae5f489b926f3
(cherry picked from commit 044ffbbbaa7dc07c2aa40a35d5d13b1b3e7bd0c0)
 2013-08-21 23:08:21 +00:00
Isaac Katzenelson
edf7c5caf9 Merge "Fix VALUE_RINGTONE_SILENT ref." 2013-08-21 23:08:04 +00:00
Sam Blitzstein
044ffbbbaa Fix VALUE_RINGTONE_SILENT ref. 
Change-Id: I115c8d2e0e972f6d7d732071d26ae5f489b926f3
 2013-08-21 16:02:21 -07:00
Baligh Uddin
e09b597d86 Import translations. DO NOT MERGE 
Change-Id: I63fcb0d1484bc7751e754e93399bcfbe8d8129e9
Auto-generated-cl: translation import
 2013-08-21 15:57:17 -07:00
Elliott Hughes
554d5e11b5 am ac26d9db: am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE." 
* commit 'ac26d9db0e10f3c7849bbf78220d55f213ab6e2a':
  The VM handles blocking SIGPIPE.
 2013-08-21 15:43:36 -07:00
Elliott Hughes
ac26d9db0e am 3d86d3b6: am f39abeb4: Merge "The VM handles blocking SIGPIPE." 
* commit '3d86d3b633105695881fbfa55332fc8aa09d0573':
  The VM handles blocking SIGPIPE.
 2013-08-21 15:40:22 -07:00
Elliott Hughes
3d86d3b633 am f39abeb4: Merge "The VM handles blocking SIGPIPE." 
* commit 'f39abeb4c4fe19bb0b83d1218e180d5ae1ef1a11':
  The VM handles blocking SIGPIPE.
 2013-08-21 15:38:19 -07:00
Elliott Hughes
f39abeb4c4 Merge "The VM handles blocking SIGPIPE." 2013-08-21 22:35:28 +00:00
Jonathan Dixon
4f28d70aa3 Merge "Fix nit - use primative type and make volatile" 2013-08-21 21:58:41 +00:00
Eino-Ville Talvala
7b29779d97 Camera1: Rename setPreviewTexture to ...Target for clarity 
Bug: 10312644
Change-Id: I4bee90428cb932a12d73dad89e91bb2ef492dc86
 2013-08-21 14:54:19 -07:00
Sam Blitzstein
14e9873663 am 3ec1a686: am 435e7dfd: Extend AlarmClock API (just slightly) 
* commit '3ec1a686dd51f0c59c028d49e5f3104090059723':
  Extend AlarmClock API (just slightly)
 2013-08-21 14:52:40 -07:00
Dirk Dougherty
a345833ace Temporarily disable sample code html generation in docs builds. 
Change-Id: Ibcf0e4d5ab63968211528f528cc5bee914d7a556
 2013-08-21 14:52:00 -07:00
Sam Blitzstein
3ec1a686dd am 435e7dfd: Extend AlarmClock API (just slightly) 
* commit '435e7dfd922510bbc081800d0c6092ea52ed9cd1':
  Extend AlarmClock API (just slightly)
 2013-08-21 14:50:05 -07:00
Sam Blitzstein
435e7dfd92 Extend AlarmClock API (just slightly) 
Add some extras to SET_ALARM action.
Add SET_TIMER action.

Change-Id: I436864ca875a7eb1c424d0d21882d624780d6ff1
(cherry picked from commit fe7dedefe9c146209f73306dbd1584f251f85d1c)
 2013-08-21 21:41:46 +00:00
Sam Blitzstein
0fb6488e0a Merge "Extend AlarmClock API (just slightly)" 2013-08-21 21:39:52 +00:00
Chet Haase
5c9c0be0fb am 3498d43a: am 5a284c42: Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev 
* commit '3498d43a3d2c4d21b4a58d0f81079964db551d43':
  Cancel running LayoutTransition before removing it from a container
 2013-08-21 14:16:31 -07:00
Chet Haase
3498d43a3d am 5a284c42: Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev 
* commit '5a284c42087104ffe56619b204b9936cd2c345c7':
  Cancel running LayoutTransition before removing it from a container
 2013-08-21 14:12:31 -07:00
Chet Haase
5a284c4208 Merge "Cancel running LayoutTransition before removing it from a container" into klp-dev 2013-08-21 21:09:10 +00:00
Alan Viverette
18429a1cdf am 1210c61b: am a052d5a7: Merge "Move caption view from Settings into framework" into klp-dev 
* commit '1210c61be954b0c12b4b391535d64a71d6368637':
  Move caption view from Settings into framework
 2013-08-21 14:08:33 -07:00
Alan Viverette
1210c61be9 am a052d5a7: Merge "Move caption view from Settings into framework" into klp-dev 
* commit 'a052d5a772665be53ecbcc4242dcf60e42453770':
  Move caption view from Settings into framework
 2013-08-21 14:05:40 -07:00
Alan Viverette
a052d5a772 Merge "Move caption view from Settings into framework" into klp-dev 2013-08-21 21:03:51 +00:00
destradaa
264705a3f6 Fixes to FlpHal JNI layer. 
Change-Id: I6bc7cab7b8a042be89097f786b42d8b9ae0425ea
 2013-08-21 14:03:50 -07:00
Chet Haase
ef3cbfd4c4 Cancel running LayoutTransition before removing it from a container 
Previously, setting a new LayoutTransition object on a container would
not do anything to the old transition object (if it existed). This means
that the previous transition could be mid-flight, changing stuff in that
container, and would continue doing so even after it was removed.
This could cause artifacts like that in the bug below where views
that are fading out would be put in the containers "disappearing children"
list for the duration of the fade... and then would never be removed from
that list because the container was no longer connected to that transition.
This caused items to stay visible even after they were removed from
their parent containers.

Issue #10119571 LayoutTransitions sometimes does not honor view's visibility

Change-Id: I3efa4065e47fa97c4dd90410bbc1a0273c2b8079
 2013-08-21 14:01:02 -07:00
Elliott Hughes
437e76208d The VM handles blocking SIGPIPE. 
We don't need this any more.

Bug: 10211309
Change-Id: I8be0071d50296974e3861f8af9d2bae4f5678d5a
 2013-08-21 13:56:15 -07:00
Alan Viverette
398ec0368b Move caption view from Settings into framework 
Renamed to SubtitleView, moved dimensions into resources.

BUG: 10260603
Change-Id: I5d86ee21ca260540ba3201c5295a5c1353e2d963
 2013-08-21 13:43:00 -07:00
Mathieu Chartier
8a31b86071 am 577a0759: am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev 
* commit '577a0759838fc2d3ae45b19a78d4cb8ce45c491a':
  Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
 2013-08-21 13:16:47 -07:00
Mathieu Chartier
577a075983 am 67a4d32c: Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev 
* commit '67a4d32c0d722e5daec48918211bf1474ab2f667':
  Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true".
 2013-08-21 13:13:58 -07:00
Mathieu Chartier
67a4d32c0d Merge "Launch VM with -XX:LowMemoryMode if ro.config.low_ram is "true"." into klp-dev 2013-08-21 20:09:46 +00:00