summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Improve clip support (add intersect, union and replace.)Romain Guy2010-07-162-18/+21
| | | | | | | This change also modifies the way the clip is stored. The clip is now always stored in screen-space coordinates. Change-Id: I96375784d82dfe975bc6477a159e6866e7052487
* Merge "Fixing NPE in CursorLoader"Dmitri Plotnikov2010-07-151-1/+3
|\
| * Fixing NPE in CursorLoaderDmitri Plotnikov2010-07-151-1/+3
| | | | | | | | Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
* | Merge "fix a bug where some accounts changed listeners don't see the new ↵Fred Quintana2010-07-151-16/+16
|\ \ | |/ |/| | | version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called."
| * fix a bug where some accounts changed listeners don't see the newFred Quintana2010-07-151-16/+16
| | | | | | | | | | | | | | | | | | version of the accounts because the accounts changed broadcast is sent from within the transaction try block, thus before db.endTransaction() is called. bug: 2839034 Change-Id: I814c7de9998ba52b85256dd2f3f19104fba3049c
* | Merge "Fix Emulator boot."Robert Greenwalt2010-07-151-2/+2
|\ \
| * | Fix Emulator boot.Robert Greenwalt2010-07-151-2/+2
| | | | | | | | | | | | | | | | | | Catch a NPE that doesn't seem to happen on devices. Change-Id: I47d599afbed76798d8d312a59e30b89664363e93
* | | Merge "Handle Input and network signal changes for HID and tethering."Jaikumar Ganesh2010-07-152-3/+15
|\ \ \
| * | | Handle Input and network signal changes for HID and tethering.Jaikumar Ganesh2010-07-152-3/+15
| |/ / | | | | | | | | | Change-Id: I7f0c2884bb766189b41093bdcd6241f4540a31f3
* | | Merge "Add support for BitmapShader."Romain Guy2010-07-152-1/+57
|\ \ \
| * | | Add support for BitmapShader.Romain Guy2010-07-152-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | This change also fixes an issue with the clip and layers. Change-Id: I5fd9832098d8cf7ae8eb781ff9bffe7defaea279
* | | | Fix bug where loader listener would be registered twice.Dianne Hackborn2010-07-153-58/+89
| |/ / |/| | | | | | | | | | | | | | Also change LoaderManager to an interface. Change-Id: Ife6d123e56cc6f63b6fe902afac35b2673761e60
* | | am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers ↵Steve Howard2010-07-152-2/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in DL manager" into gingerbread Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9' * commit '203ec9fa6eab21621969f36053d4cd59c23977a9': Interface support for custom HTTP headers in DL manager
| * \ \ am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" ↵Steve Howard2010-07-152-2/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp * commit 'd6343c26b8580f61a257a3045bfa124049201116': Interface support for custom HTTP headers in DL manager
| | * \ \ Merge "Interface support for custom HTTP headers in DL manager" into gingerbreadSteve Howard2010-07-152-2/+31
| | |\ \ \
| | | * | | Interface support for custom HTTP headers in DL managerSteve Howard2010-07-152-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * constants for new DB table, keys for including headers in a DownloadProvider.insert() call, and new URIs for retrieving headers * support in DownloadManager to pass headers to the provider
* | | | | | am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the ↵Scott Main2010-07-151-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf' * commit '4fd416880e53c172bac4a51b2eafea699b58badf': docs: lots of additions to the resources docs
| * | | | | am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources ↵Scott Main2010-07-151-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp * commit '5352d2378d2f92ebe0657e4caedb4498492fc404': docs: lots of additions to the resources docs
| | * | | | am 38137d7a: Merge "docs: lots of additions to the resources docs new ↵Scott Main2010-07-151-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread * commit '38137d7a27b037611c70a9d900aa53b4c15563bf': docs: lots of additions to the resources docs
| | | * \ \ \ Merge "docs: lots of additions to the resources docs new drawable resources ↵Scott Main2010-07-151-1/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
| | | | * | | | docs: lots of additions to the resources docsScott Main2010-06-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
* | | | | | | | am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly ↵Joe Onorato2010-07-151-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into the shared library." into gingerbread Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe' * commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe': The ICU data is no longer compiled directly into the shared library.
| * | | | | | | am 3a053db2: Merge "The ICU data is no longer compiled directly into the ↵Joe Onorato2010-07-151-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared library." into gingerbread Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp * commit '3a053db28451858162f3dd84f18fae2f245b07f1': The ICU data is no longer compiled directly into the shared library.
| | * | | | | | Merge "The ICU data is no longer compiled directly into the shared library." ↵Joe Onorato2010-07-151-1/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f6adf66a28b62a6f45c1622d669cb8c519adcbb
* | | | | | | | | Merge "checkpoint tablet status bar"Joe Onorato2010-07-152-1/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkpoint tablet status barJoe Onorato2010-07-122-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9089cce370ead4e685dffbca722fa8404a8f443
* | | | | | | | | | Add various properties to View to allow it to be moved, scaled, faded, and ↵Chet Haase2010-07-152-38/+719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotated by property manipulation instead of just Animation operations. Change-Id: Iefab11f243c7511f7bba0e32bd399ed716b9131f
* | | | | | | | | | Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect ↵Fabrice Di Meglio2010-07-151-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | what's visible on the web.)"
| * | | | | | | | | | Fix bug #2793828 (Sync/visible setting on the phone should not affect what's ↵Fabrice Di Meglio2010-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | visible on the web.) - introduce "sync4" column into Calendars table to store "selected" from Web calendar Change-Id: I2dfebb6e4a2ec85e758626a4e2b9c8b1315f095f
* | | | | | | | | | | Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions"Mike Lockwood2010-07-152-6/+132
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SQLiteDatabase: Add mechanism for registering custom sqlite3 functionsMike Lockwood2010-07-142-6/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to define a callback in Java that can be called from sqlite3 database triggers. Change-Id: I09fdbd38c9807b6b0dd19c2761b01e8db76f1adc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification ↵Andrew Stadler2010-07-141-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using insecure factory" into froyo Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114' * commit '521e9aa7523220c3dc48f6abd32fad6b76eea114': Skip hostname verification when using insecure factory
| * | | | | | | | | | | am c98e4311: am 468c82e4: Merge "Skip hostname verification when using ↵Andrew Stadler2010-07-141-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insecure factory" into froyo Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp * commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9': Skip hostname verification when using insecure factory
| | * | | | | | | | | | am 468c82e4: Merge "Skip hostname verification when using insecure factory" ↵Andrew Stadler2010-07-141-6/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread * commit '468c82e4be0630de04a50d88602cd8c6bc745962': Skip hostname verification when using insecure factory
| | | * | | | | | | | | Skip hostname verification when using insecure factoryAndrew Stadler2010-07-121-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the factory was obtained by calling getInsecure(), calls to createSocket() should skip hostname verification (along with all of the other skipped safety checks.) This change slightly relaxes the too-strict checking that was introduced in change 7fc93c36ae235115727296780dbc35101622bbd4. Bug: 2834174 Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
| | | * | | | | | | | | Merge "Doc change: Add revision notes for Android 2.2_r2 development ↵Dirk Dougherty2010-07-071-6/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform. Fix some umappable characters in WebView class doc." into froyo
| | | | * | | | | | | | | Doc change: Add revision notes for Android 2.2_r2 development platform. Fix ↵Dirk Dougherty2010-07-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some umappable characters in WebView class doc. Change-Id: I5522406335fbf96164a5b812ec4891c499343d1e
| * | | | | | | | | | | | am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp * commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0': Argh oops I didn't mean to delete this.
| | * | | | | | | | | | | Merge "Argh oops I didn't mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
| | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d0877d56f1abab3d0929a086621f4ef1212cecc
* | | | | | | | | | | | | resolved conflicts for merge of e03952c0 to masterJim Miller2010-07-145-22/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
| * | | | | | | | | | | | am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in ↵Jim Miller2010-07-145-22/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework" into gingerbread Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp * commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2': Fix 2797185: Re-enable thumbnail generation in framework
| | * | | | | | | | | | | Merge "Fix 2797185: Re-enable thumbnail generation in framework" into ↵Jim Miller2010-07-145-22/+94
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | | | Fix 2797185: Re-enable thumbnail generation in frameworkJim Miller2010-07-135-22/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This re-enables thumbnail generation code in the framework with a few improvements. In addition to enabling the system to capture thumbnails, it removes padding from the borders to account for space overlapped by system widgets (status bar, etc.). Thus, the contents of the bitmap are only those pixels unique to the activity. It also maximizes resolution of the bitmap by capturing the image in the application's current orientation. In landscape mode, it captures a bitmap with dimensions w x h. In portrait, it captures a bitmap with dimensions h x w. Where w and h are thumbnail_width and thumbnail_height as defined in dimens.xml. Though enabled, the change is not currently used in this branch. The work is being checked in here to avoid complicated downstream merges. Change-Id: Ifc8a4e0075d7d0697d8159589be3816ace31d70c
* | | | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8910eb8b6e898b77ee6fc63420d6954b496513ca
* | | | | | | | | | | | | Merge "Bug 2841148 - Add accessors for action bar context mode state."Adam Powell2010-07-143-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug 2841148 - Add accessors for action bar context mode state.Adam Powell2010-07-143-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04f3efce5a692b346756cc80c8d15f3abba10558
* | | | | | | | | | | | | am 50576fa8: merge from open-source masterThe Android Open Source Project2010-07-141-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6' * commit '50576fa8152557a25e1a231c66d694fffbab34d6': Start app with several activities with intent filter [Main, Launcher] was broken
| * | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-07-141-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
generated by cgit v1.1 at 2025-01-20 17:08:07 +0000