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

46528 Commits

Author SHA1 Message Date
Dirk Dougherty
64fe2b3a33 am 3eddb621: am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '3eddb6213dc017c78e6d641f7f4a4685db09851e':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:57:32 -08:00
Dirk Dougherty
3eddb6213d am a40420c9: am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit 'a40420c9c1c8216fd0251dc550bb22e9cc1dd177':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 11:53:27 -08:00
Dirk Dougherty
a40420c9c1 am 43eea0a6: Merge "Doc change: Change description for BRAND. Bug:11431921" into klp-docs 
* commit '43eea0a640db07c4da05146f7e68eae567592bdb':
  Doc change: Change description for BRAND. Bug:11431921
 2013-11-21 19:49:46 +00:00
Dirk Dougherty
491b40d752 Doc change: Change description for BRAND. 
Bug:11431921

Change-Id: Id08bb58a52699942e0cf626aeb577ac05c84c575
 2013-11-21 09:31:40 -08:00
Derek Sollenberger
f8627d658d Merge "framework changes needed to support Skia at r12108." 2013-11-21 15:04:03 +00:00
Jeff Brown
96a1f90c37 am f508c2b0: am d2a0192b: am b40ce4b8: Make action bar media router icons blue again. 
* commit 'f508c2b0fbe8ad1c0555db5d47c0812d80b9e367':
  Make action bar media router icons blue again.
 2013-11-20 16:56:29 -08:00
Jeff Brown
f508c2b0fb am d2a0192b: am b40ce4b8: Make action bar media router icons blue again. 
* commit 'd2a0192bf237994f0132625fc00d21896912151e':
  Make action bar media router icons blue again.
 2013-11-20 16:51:07 -08:00
Jeff Brown
d2a0192bf2 am b40ce4b8: Make action bar media router icons blue again. 
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.
 2013-11-20 16:48:52 -08:00
Jeff Brown
b40ce4b8e8 Make action bar media router icons blue again. 
This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.

Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
 2013-11-20 15:27:43 -08:00
John Spurlock
5d95899881 Merge "Remove unused imports from frameworks/base." 2013-11-20 21:47:52 +00:00
Baligh Uddin
7e78434cbf Merge "Import translations. DO NOT MERGE" 2013-11-20 21:08:22 +00:00
Derek Sollenberger
ed79ff0026 framework changes needed to support Skia at r12108. 
Change-Id: I231e187e7d2db84fa06bd6783c9b49abba5b4e70
 2013-11-20 14:50:51 -05:00
Baligh Uddin
c4f00c63e1 Import translations. DO NOT MERGE 
Change-Id: I40eef5497c33e91306b1967b9d31aff9ebd137da
Auto-generated-cl: translation import
 2013-11-20 09:44:54 -08:00
Baligh Uddin
853251e74f Import translations. DO NOT MERGE 
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
 2013-11-20 09:17:20 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base. 
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
 2013-11-20 11:31:47 -05:00
George Mount
34d8519de4 Merge "Add animations along a Path." 2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54 Add animations along a Path. 
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
 2013-11-20 07:39:26 -08:00
Christopher Tate
266f48cc04 am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
  Harden against transiently unavailable backup transports
 2013-11-19 11:53:02 -08:00
Christopher Tate
c8ea38fe18 am e3705342: am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
  Harden against transiently unavailable backup transports
 2013-11-19 11:48:50 -08:00
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
 2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
 2013-11-19 11:24:46 -08:00
Sascha Prueter
a9249322d5 am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
  Trying to unbreak build...
 2013-11-18 23:31:11 -08:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
 2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506 Trying to unbreak build... 
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
 2013-11-19 06:51:21 +00:00
Christopher Tate
fa331b1dfb am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports
 2013-11-18 18:48:29 -08:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
 2013-11-18 18:44:47 -08:00
Christopher Tate
8f98252afe Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
 2013-11-18 16:12:38 -08:00
John Spurlock
180979f76b Fix logic problems in AnimationDrawable and View. 
1. View now checks both queues when unscheduling runnables,
fixing the case where work was scheduled pre-attach, and unscheduled
post-attach.

2. AnimationDrawable avoids posting duplicate runnables when rescheduling
itself.

3. Decouple is-animation-running state from current frame pointer in
AnimationDrawable.  Some calls init to the first frame, but do not
kick off the animation.

4. Remove workaround in SystemUI's AnimatedImageView (status bar icon)
now that the underlying framework issues are fixed.

Bug:11694594
Change-Id: I77ca6bd80262f7edcf980b2d7efc2592f8051f29
 2013-11-18 15:59:37 -05:00
Raph Levien
aff6ea9516 Merge "Initial integration of Minikin to framework" 2013-11-18 19:38:18 +00:00
Raph Levien
a033630e80 Initial integration of Minikin to framework 
With this patch, framework does at least some of its text rendering
using Minikin instead of TextLayoutCache. There's a lot of stuff broken
and not yet implemented, but the phone will boot.

Changes are hidden behind USE_MINIKIN, which should be set in
BoardConfig.mk for the brave. Without that, there are changes to
signatures in JNI methods and so on, but shouldn't be any visible
changes.

This commit also introduces a new abstraction for Typeface:

The new TypefaceImpl abstraction represents the functionality that
corresponds to a Java Typeface object. Currently it is backed by
SkTypeface, but in the migration to Minikin it is a FontCollection
combined with a FontStyle. This patch introduces a USE_MINIKIN
preprocessor switch, so there is no substantial change to existing
Skia-based code, but which lets us start replacing the implementation
with the Minikin version.

Change-Id: I532c4c2d32d4f4c1f349dc1db37caa112af587ea
 2013-11-18 10:32:20 -08:00
Baligh Uddin
63c7ca496d Import translations. DO NOT MERGE 
Change-Id: I237e581fd77ba1c3eca79d60905916135109acec
Auto-generated-cl: translation import
 2013-11-18 09:17:04 -08:00
Baligh Uddin
2337eb1b65 Import translations. DO NOT MERGE 
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
 2013-11-18 08:49:48 -08:00
Alan Viverette
cac68c3f64 Merge "Deprecate Activity.setTitleColor()" 2013-11-15 23:47:53 +00:00
Alan Viverette
2525d9c843 Deprecate Activity.setTitleColor() 
BUG: 11712103
Change-Id: Id34ffb59d3f848c591a98880c6cdd9058e5a38dc
 2013-11-15 14:42:19 -08:00
Mike Lockwood
6ae75780e9 Merge "Remove obsolete "headless" support" 2013-11-15 22:22:58 +00:00
Wink Saville
764043f2ba am 044bc25f: am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '044bc25fb58b6b89d4a6dca09863981877a9f337':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:50:12 -08:00
Wink Saville
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:42:55 -08:00
Wink Saville
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev 
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
 2013-11-15 11:39:16 -08:00
Wink Saville
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
Mike Lockwood
ed8902d3b5 Remove obsolete "headless" support 
Change-Id: I18e7a4c5166163372ec0a8abbef1063668a0f5b6
 2013-11-15 11:01:47 -08:00
Martijn Coenen
7fbed8456f Merge "Add "urn:nfc" shortener." 2013-11-15 17:34:29 +00:00
Wink Saville
9124d56acc Add config_restartRadioAfterProvisioning 
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
 2013-11-15 08:27:53 -08:00
Jeff Brown
30cb5c3ffa am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '2ea480cac89460ee2524cd080e90f6240e8eebf5':
  Disallow applications from initiating cast screen.
 2013-11-15 00:42:46 -08:00
Jeff Brown
2ea480cac8 am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
  Disallow applications from initiating cast screen.
 2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev 
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
  Disallow applications from initiating cast screen.
 2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2 Merge "Disallow applications from initiating cast screen." into klp-dev 2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen. 
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
 2013-11-15 00:29:43 -08:00
Mindy Pereira
a51b01c8c1 am bb8e75e6: am cce2e194: am 5823352c: Cancel double tap mode on action_up 
* commit 'bb8e75e6c451a71bc7d0301f376d61781cc08393':
  Cancel double tap mode on action_up
 2013-11-14 19:52:22 -08:00
Mindy Pereira
bb8e75e6c4 am cce2e194: am 5823352c: Cancel double tap mode on action_up 
* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4':
  Cancel double tap mode on action_up
 2013-11-14 19:48:42 -08:00
Mindy Pereira
cce2e1944c am 5823352c: Cancel double tap mode on action_up 
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
  Cancel double tap mode on action_up
 2013-11-14 19:44:52 -08:00