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

32957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
5302798581 Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." 2010-10-05 15:19:27 -07:00
Scott Main
537b222514 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-05 15:17:40 -07:00
James Dong
73fe79da09 am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread 
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
 2010-10-05 15:17:29 -07:00
Gilles Debunne
a4a01b5d6b am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
 2010-10-05 15:17:17 -07:00
Adam Powell
195e9d8adb am dcbf315e: am 368733b2: Remove overscroll_edge.png from drawable/ 
Merge commit 'dcbf315e83234623622bd268a823ecc4dc49e375'

* commit 'dcbf315e83234623622bd268a823ecc4dc49e375':
  Remove overscroll_edge.png from drawable/
 2010-10-05 15:17:05 -07:00
Adam Powell
59124abf2d am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'

* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
  Fix bug 3052686 - ScrollView padding treated incorrectly
 2010-10-05 15:16:48 -07:00
Scott Main
f6fe78b2ae docs: Rewrite of App Fundamentals.. Part 1. 
This introduces two new docs:
Activities
  Provides a fundamental introduction to how activities work, including
  the basics about layout, manifest entries, starting activies, getting results,
  and the complete discussion about the lifecycle (which used to be in the
  fundamentals.jd document under "Component Lifecycles"), but also now includes more
  information about saving instance state (with new diagrams).
Tasks and Back Stack
  A large expansion of the material originally presented in the fundamentals.jd
  document under "Activities and Tasks". This doc talks all about how tasks and
  the back stack work. This content re-organization is important because fragments
  can now become a part of the back stack (which is a task-oriented concept), thus,
  it's important to separate the task ideas from being tied directly to activities only,
  which is how tasks are currently discussed. However, fragments are not yet discussed
  here in detail---that will come later when the fragment dev guide is introduced.

Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
 2010-10-05 15:06:33 -07:00
Romain Guy
10bc365225 Merge "Add support for paletted textures." 2010-10-05 15:00:01 -07:00
Romain Guy
7adaf3d1aa Add support for paletted textures. 
Change-Id: I36e6069bd58f78c609cdd1f3e4560c98f128f48e
 2010-10-05 14:58:09 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Christopher Tate
643bfdaf45 Merge "Make View.DragThumbnailBuilder a static class" 2010-10-05 13:43:44 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now. 
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
 2010-10-05 13:42:35 -07:00
Jason Sams
68159aabb3 Merge "Implement allocation resizing." 2010-10-05 13:35:47 -07:00
Jason Sams
5edc608a07 Implement allocation resizing. 
Change-Id: Ie38d42419d595cec730a8721cc1321c5edb6b4d6
 2010-10-05 13:32:49 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class 
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
 2010-10-05 13:14:25 -07:00
Alex Sakhartchouk
cd1b8d3665 Merge "Adding text metrics to renderscript." 2010-10-05 13:13:40 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-05 12:54:41 -07:00
Vasu Nori
54f9ac5880 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Gilles Debunne
3d535d2949 Merge "resolved conflicts for merge of 8390651c to master" 2010-10-05 12:26:22 -07:00
Gilles Debunne
ff3c191d2a resolved conflicts for merge of 8390651c to master 
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
 2010-10-05 12:11:56 -07:00
Alex Sakhartchouk
10825a07ae Adding text metrics to renderscript. 
Change-Id: Ica460525243d714a278e4ad5e436af43e1008e0c
 2010-10-05 11:33:27 -07:00
Ficus Kirkpatrick
f6904c4bb4 Merge "Reduce log spam." 2010-10-05 11:33:03 -07:00
Ficus Kirkpatrick
6fd771b346 Reduce log spam. 
Remove the WifiService ACTION_BATTERY_CHANGED log message.

Change-Id: Idfcdf1661f9243a9eb043419490a7138533f3357
 2010-10-05 11:28:23 -07:00
Adam Cohen
ef52176f12 Changing AdapterViewAnimator to use the new animation APIs 
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
 2010-10-05 11:02:25 -07:00
Vasu Nori
6d970255af STOPSHIP - add illegalStateException to catch potential deadlocks in db 
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner

Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
 2010-10-05 10:50:45 -07:00
Joe Onorato
066b5c5166 manual merge Merge commit '77e42376' into work 
Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
 2010-10-05 12:37:03 -04:00
Patrick Scott
4243a3a6ed Add postSync so that the chrome stack has access. 
Bug: 3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
 2010-10-05 09:30:24 -04:00
satok
d87c2594c6 Add utility of enabled InputMethod settings to InputMethodManagerService 
- Add setter of enabled InputMethodSubtypes
- Enabled InputMethods are saved as follows:
-- enabled_inputmethod0;enabled_subtype0;enabled_subtype1:enabled_inputmethod1
- TODO: Fix Settings application to parse new Enabled InputMethod string.
-- Currently IMMS doesn't save InputMethodSubtypes so this will not break Settings application.

Change-Id: Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
 2010-10-05 14:51:31 +09:00
Romain Guy
2fe9a8f6f6 Correctly invalidate the drawing cache when an invalidate is requested. 
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
 2010-10-04 20:19:34 -07:00
Christopher Tate
2347b59e58 Merge "Refinements to drag/drop" 2010-10-04 19:40:28 -07:00
Gil Dobjanschi
3937d3d4f2 Merge "Added mute APIs for MediaVideoItem and AudioTrack" 2010-10-04 19:04:36 -07:00
Gil Dobjanschi
61f9184547 Added mute APIs for MediaVideoItem and AudioTrack 
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
 2010-10-04 19:02:28 -07:00
Scott Main
d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master 
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
 2010-10-04 18:42:49 -07:00
Christopher Tate
2c095f3677 Refinements to drag/drop 
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder.  This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.

startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.

Drag events are now dispatched only to VISIBLE views.

Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.

Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
 2010-10-04 18:29:09 -07:00
Patrick Dubroy
629e26bbef am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread 
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'

* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
  Fix 2-pixel offset unlock jog tab
 2010-10-04 18:23:44 -07:00
Vasu Nori
060e25bf12 don't print informational messages from sqlite in log 
right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages

Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
 2010-10-04 18:10:51 -07:00
Gil Dobjanschi
f124ce7394 Merge "Save AudioTrack to XML" 2010-10-04 17:52:43 -07:00
Romain Guy
28d891409c Merge "Remove logs to reduce logcat spam." 2010-10-04 17:24:21 -07:00
Romain Guy
bdb801ca99 Remove logs to reduce logcat spam. 
Change-Id: I5fc295b05b5d82bb86827b88e94dd51e8bcdc7d3
 2010-10-04 17:22:29 -07:00
Gil Dobjanschi
3398abafca Save AudioTrack to XML 
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
 2010-10-04 17:20:43 -07:00
Chet Haase
064c0b47ae Merge "Changed LayoutTransition to disable animations when set to null" 2010-10-04 17:16:03 -07:00
Romain Guy
14e647280d Merge "Reorder logs." 2010-10-04 17:15:15 -07:00
Romain Guy
11fd654a90 Reorder logs. 
Change-Id: I4adbd53662e1f509c860898c8ff9d19eaabd6d5b
 2010-10-04 17:12:16 -07:00
Chet Haase
5d6d7b9c3d Changed LayoutTransition to disable animations when set to null 
Change-Id: Ic4d67135a273ea816c3d15bce05da611bd6bae53
 2010-10-04 16:58:04 -07:00
Gilles Debunne
b6b193013d Merge "resolved conflicts for merge of 242fa52b to master" 2010-10-04 16:01:22 -07:00
Patrick Dubroy
3dd101133a resolved conflicts for merge of 242fa52b to master 
Change-Id: I6a6c134fe4fb05dbc15249661b441d88534acb1e
 2010-10-04 15:49:40 -07:00
Gil Dobjanschi
e799720dd4 Merge "Added audio track playback API" 2010-10-04 15:49:26 -07:00
Scott Main
fc7f39196b am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp

* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-04 15:49:07 -07:00
James Dong
6a02ba0100 am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread 
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp

* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
  Resilent media time stamp adjustment
 2010-10-04 15:48:59 -07:00
Gilles Debunne
6f4f01062b am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp

* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
  Removed icon in Alert dialog header.
 2010-10-04 15:48:54 -07:00