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

60650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
7962d2f129 am 52201ae5: am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0 
* commit '52201ae5421b1efed2568109f3fc37462fdb7c35':
  Fix Tethering settings.
 2011-10-27 21:54:09 +00:00
Svetoslav Ganov
ec6c89b616 Merge "Minor documentation fixes for the APIs to expose virtual view tree." 2011-10-27 14:52:51 -07:00
Scott Main
f9eba6bfb9 am b4e50fe0: Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 
* commit 'b4e50fe03c269e0c6b60db1702993ac0649bb5a2':
  docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later)
 2011-10-27 21:47:51 +00:00
Robert Greenwalt
52201ae542 am 8d059ac5: Merge "Fix Tethering settings." into ics-mr0 
* commit '8d059ac5b186547a86bb92678c7d1cb13fd8ce1c':
  Fix Tethering settings.
 2011-10-27 21:46:35 +00:00
RoboErik
28e9733e35 am 8805dc13: Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1 
* commit '8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
  b/5309787 Add new columns to hidden list of read only fields
 2011-10-27 21:45:44 +00:00
Scott Main
b4e50fe03c Merge "resolved conflicts for merge of b6cf4b7f to ics-mr1" into ics-mr1 2011-10-27 14:43:50 -07:00
RoboErik
8805dc137a Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1 2011-10-27 14:41:03 -07:00
Scott Main
e815a58557 resolved conflicts for merge of b6cf4b7f to ics-mr1 
Change-Id: Ie5b151ad0dbaf6577b836f10f74181b898f26320
 2011-10-27 14:40:53 -07:00
James Dong
b4a9fd9faf am 17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 
* commit '17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
  Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
 2011-10-27 21:13:54 +00:00
RoboErik
c7ef9390cf b/5309787 Add new columns to hidden list of read only fields 
Change-Id: I9bfc01e4211087be0dfd144c022903c51817c024
 2011-10-27 14:11:44 -07:00
James Dong
17a5fb36f8 Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 2011-10-27 14:09:50 -07:00
Mark Brophy
437049b76e Merge "Fix scroll listeners lost in ViewTreeObserver." 2011-10-27 14:08:31 -07:00
Gilles Debunne
e9c98bdf99 Merge "Potential thread concurrency issue with WordIterators." 2011-10-27 14:04:03 -07:00
John Reck
0cce87ef07 am 44c99092: Merge "Keep text handles in sync with native touch targets" into ics-mr1 
* commit '44c990927c362b26b51c4388f8c51e8c799f9932':
  Keep text handles in sync with native touch targets
 2011-10-27 20:43:40 +00:00
John Reck
44c990927c Merge "Keep text handles in sync with native touch targets" into ics-mr1 2011-10-27 13:40:24 -07:00
Daniel Sandler
0dd6b86948 am 9760cd14: Merge "Restore bluetooth icons on tablets." into ics-mr1 
* commit '9760cd1463f06f12c1049fb7ee26796d01cbab99':
  Restore bluetooth icons on tablets.
 2011-10-27 20:21:15 +00:00
Robert Greenwalt
8d059ac5b1 Merge "Fix Tethering settings." into ics-mr0 2011-10-27 13:20:15 -07:00
RoboErik
6520174f4c am 20345af2: Merge "Add new Calendar APIs to fw" into ics-mr1 
* commit '20345af24a50798965f6d295fbe4cc8f78c95e7f':
  Add new Calendar APIs to fw
 2011-10-27 20:19:06 +00:00
Daniel Sandler
9760cd1463 Merge "Restore bluetooth icons on tablets." into ics-mr1 2011-10-27 13:16:43 -07:00
RoboErik
20345af24a Merge "Add new Calendar APIs to fw" into ics-mr1 2011-10-27 13:13:36 -07:00
Scott Main
b6cf4b7f04 docs: quick update for fragments guide to consider handsets and new figure (bigger update coming later) 
Change-Id: Id662300e3b2d289dd3ea5213fc6d12c49de7fc92
 2011-10-27 13:03:43 -07:00
Daniel Sandler
0f167d7566 Restore bluetooth icons on tablets. 
- status bar
- notification panel header area

Bug: 5385369
Change-Id: I382b9e4fbd3dd440919484c70d50b00ce85a8fa1
 2011-10-27 14:58:52 -04:00
John Reck
effabe8d8b Keep text handles in sync with native touch targets 
Bug: 5522153
 Also add some slop to the handle targets, cleaned
 up the JNI and improved debugging.

Change-Id: I9ac637d793f2bd88d5315aa1483a4513d2496716
 2011-10-27 11:32:55 -07:00
Scott Main
5158f043b0 am 7c210d2d: am cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0 
* commit '7c210d2dad36f19abefe4e1e8224579c66a737c4':
  docs: change calendar overview to recommend using data URI instead of MIME type for event intents
 2011-10-27 18:09:55 +00:00
Jeff Hamilton
b38fbaf256 Merge "Clarify the docs around the activityInfo field." 2011-10-27 11:08:35 -07:00
Jeff Hamilton
ca756bfd97 Clarify the docs around the activityInfo field. 
Change-Id: Id9a5ac610d564165073cb60e5b631b1cba3e8187
 2011-10-27 13:07:23 -05:00
Scott Main
7c210d2dad am cbce4eda: Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0 
* commit 'cbce4eda4fae6b18efde9aa161a665e92a36c969':
  docs: change calendar overview to recommend using data URI instead of MIME type for event intents
 2011-10-27 18:06:15 +00:00
Scott Main
cbce4eda4f Merge "docs: change calendar overview to recommend using data URI instead of MIME type for event intents" into ics-mr0 2011-10-27 11:04:46 -07:00
satok
98af0a8178 am c04e2d5f: am e0122406: Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0 
* commit 'c04e2d5f1678b3251edbcc1297015b49b36086a7':
  Add a path to HelloSpellChecker sample application for SDK build
 2011-10-27 17:55:52 +00:00
satok
c04e2d5f16 am e0122406: Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0 
* commit 'e0122406bb1c512ee57f3a5a1503435a0779e1d8':
  Add a path to HelloSpellChecker sample application for SDK build
 2011-10-27 17:51:51 +00:00
satok
e0122406bb Merge "Add a path to HelloSpellChecker sample application for SDK build" into ics-mr0 2011-10-27 10:50:14 -07:00
RoboErik
4172d95a67 Add new Calendar APIs to fw 
b/5317399 b/5309787 b/5207781 b/5347210 Adds apis for a color
table to support future migrations. Adds allowedAttendeeTypes
and allowedAvailabilities for exchange/gsync support. Adds
type_resource for attendees and tentative availability. Documents
that eventTimezone is required for creating an event.

Change-Id: Id3f866c46f76f2b5b098f4961ea09d48f17598c3
 2011-10-27 10:50:09 -07:00
Bill Gruber
7359d4fbb4 am a9039329: am 6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672 
* commit 'a903932948c0a93b47e243a1dcd6e2a8643191ff':
  docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
 2011-10-27 17:49:25 +00:00
Bill Gruber
a903932948 am 6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672 
* commit '6c60e9a3ba3555590d7e7bdaf3634c9daaf8b33b':
  docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
 2011-10-27 17:45:36 +00:00
Bill Gruber
6c60e9a3ba docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 
Doc update: publishing topics
Also fixes bug 5279672

Change-Id: Ifb06f7f56ee372a9680a63bdb659f495698fe794
 2011-10-27 10:40:13 -07:00
satok
182e4ae2f4 Add a path to HelloSpellChecker sample application for SDK build 
Change-Id: I77e334f8e2b50b8609b1729edb253254d6b7360b
 2011-10-28 02:27:53 +09:00
Scott Main
42e6db50a9 am 3c81fc9e: am 56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0 
* commit '3c81fc9e50cd1475e58e0b979d5ee26da00afd01':
  docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
 2011-10-27 17:08:51 +00:00
Scott Main
3c81fc9e50 am 56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0 
* commit '5653985830f35184ea772b2ccc8333d6ef634761':
  docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
 2011-10-27 17:04:52 +00:00
Scott Main
5653985830 Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0 2011-10-27 10:03:10 -07:00
Eric Fischer
685769c04e am 80d67c66: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '80d67c66cef1b6cded786ec51d87a0c786ac12c6':
  Import revised translations.  DO NOT MERGE
 2011-10-27 16:48:44 +00:00
Eric Fischer
80d67c66ce Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-27 09:43:23 -07:00
Scott Main
cea5853949 docs: change calendar overview to recommend using data URI instead of MIME type for event intents 
Change-Id: Ic7ac54fd6fd9fc0ad882beccdd2edb260e6017a3
 2011-10-27 09:24:17 -07:00
Andreas Huber
0a69dc0719 am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 
* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
  Fix a reference to a stale pointer in AwesomePlayer.
 2011-10-27 16:11:56 +00:00
Andreas Huber
1388aced2a Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 2011-10-27 09:07:23 -07:00
Scott Main
b68d7ab80a am 12f9900b: am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0 
* commit '12f9900bfb004a09ea6a8ce0df27c661124f46ac':
  docs: add package description for wifi.p2p and update the one for wifi
 2011-10-27 15:55:22 +00:00
Scott Main
12f9900bfb am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0 
* commit '737c3dd9f116ae68bcb9b5ce6855afaf2f59738b':
  docs: add package description for wifi.p2p and update the one for wifi
 2011-10-27 15:51:21 +00:00
Scott Main
737c3dd9f1 Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0 2011-10-27 08:49:48 -07:00
James Dong
33fe290ca3 Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording. 
Change-Id: I328d9fa83a381415d7648218a6fb93b3724bbcc6
related-to-bug: 5343832
 2011-10-27 08:47:07 -07:00
Mike Lockwood
b453daf952 am d085df31: am aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0 
* commit 'd085df318afc8b3485afdd81106ce93a13265ebb':
  Revert "PowerManagerService: Enable light sensor debug output"
 2011-10-27 13:55:07 +00:00
Mike Lockwood
d085df318a am aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0 
* commit 'aac4184a5a0ab969140a11e1ef258fcb4cba07a9':
  Revert "PowerManagerService: Enable light sensor debug output"
 2011-10-27 13:51:04 +00:00