summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* am bd754205: Merge "Fix to not lose state when saving a deactivated fragment....Dianne Hackborn2011-06-031-8/+6
|\
| * Fix to not lose state when saving a deactivated fragment.Dianne Hackborn2011-06-031-8/+6
* | am 185e3e24: Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
|\ \ | |/
| * Fix when managed cursors are required.Dianne Hackborn2011-06-031-16/+18
* | am b46ed763: Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-023-23/+130
|\ \ | |/
| * Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-023-23/+130
* | am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-011-1/+1
|\ \ | |/
| * Work around OpenFeint bug.Dianne Hackborn2011-06-011-1/+1
* | am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescre...Dianne Hackborn2011-05-312-4/+20
|\ \ | |/
| * Fix issue #4502672: Wrong xml resources used for homescreen widgets.Dianne Hackborn2011-05-312-4/+20
* | am 94250ac6: Merge "Add new supports-screens attributes for declaring the com...Dianne Hackborn2011-05-261-1/+1
|\ \ | |/
| * Merge "Add new supports-screens attributes for declaring the compatible scree...Dianne Hackborn2011-05-261-1/+1
| |\
| | * Add new supports-screens attributes for declaring the compatible screens.Dianne Hackborn2011-05-261-1/+1
* | | am 1d8f8819: Merge "Break apart queries to getInstalled* API DO NOT MERGE" in...Kenny Root2011-05-261-2/+26
|\ \ \ | |/ /
| * | Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2Kenny Root2011-05-261-2/+26
| |\ \ | | |/ | |/|
| | * Break apart queries to getInstalled* API DO NOT MERGEKenny Root2011-05-261-2/+26
* | | am 7a09f72b: Merge "Rework how we decide whether to use system or status bar....Dianne Hackborn2011-05-261-3/+0
|\ \ \ | |/ /
| * | Rework how we decide whether to use system or status bar.Dianne Hackborn2011-05-261-3/+0
| |/
* | am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2Dianne Hackborn2011-05-263-1/+72
|\ \ | |/
| * Spiffy new compatibility mode UI.Dianne Hackborn2011-05-253-1/+72
* | am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2Dianne Hackborn2011-05-242-2/+8
|\ \ | |/
| * More compatibility mode improvements.Dianne Hackborn2011-05-242-2/+8
* | am 40277df7: Merge "Add "television" mode." into honeycomb-mr2Dianne Hackborn2011-05-231-1/+2
|\ \ | |/
| * Add "television" mode.Dianne Hackborn2011-05-231-1/+2
* | am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeyc...Adam Powell2011-05-201-5/+18
|\ \ | |/
| * New opaque cab assets; search dialog tweaks.Adam Powell2011-05-191-5/+18
* | am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backs...Chet Haase2011-05-192-3/+41
|\ \ | |/
| * DO NOT MERGE: Add custom fragment anims for popping backstackChet Haase2011-05-192-3/+41
* | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...Dianne Hackborn2011-05-162-14/+5
|\ \ | |/
| * DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-162-14/+5
* | am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity ma...Dianne Hackborn2011-05-162-55/+34
|\ \ | |/
| * DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.Dianne Hackborn2011-05-132-55/+34
* | am f9dd34f4: DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.Dianne Hackborn2011-05-134-5/+84
|\ \ | |/
| * DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.Dianne Hackborn2011-05-134-5/+84
* | am 6121f06e: Merge "Fix a bug where an action bar could be created when it sh...Dianne Hackborn2011-05-131-0/+5
|\ \ | |/
| * Merge "Fix a bug where an action bar could be created when it should not be."...Dianne Hackborn2011-05-131-0/+5
| |\
| | * Fix a bug where an action bar could be created when it should not be.Adam Powell2011-05-131-0/+5
* | | am f3f2d731: Merge "DO NOT MERGE. Integrate fragment work from master" into ...Dianne Hackborn2011-05-135-35/+178
|\ \ \ | |/ /
| * | DO NOT MERGE. Integrate fragment work from masterDianne Hackborn2011-05-135-35/+178
| |/
* | am df9799f0: Fix build.Dianne Hackborn2011-05-121-0/+3
|\ \ | |/
| * Fix build.Dianne Hackborn2011-05-121-0/+3
* | am 0f1de9ad: New compat mode front end: UI and persistence.Dianne Hackborn2011-05-123-6/+152
|\ \ | |/
| * New compat mode front end: UI and persistence.Dianne Hackborn2011-05-123-6/+152
* | am 0c6cbf41: Merge "Better compat mode part one: start scaling windows." into...Dianne Hackborn2011-05-097-79/+217
|\ \ | |/
| * Better compat mode part one: start scaling windows.Dianne Hackborn2011-05-097-79/+217
* | resolved conflicts for merge of ceae9983 to honeycomb-plus-aospBrad Fitzpatrick2011-03-151-1/+1
|\ \ | |/ |/|
| * am 9a01a2f2: Merge "Fixing self-assignment in cloning code."Brad Fitzpatrick2011-03-151-1/+1
| |\
| | * Merge "Fixing self-assignment in cloning code."Brad Fitzpatrick2011-03-151-1/+1
| | |\
| | | * Fixing self-assignment in cloning code.Jozef BABJAK2011-02-221-1/+1
| * | | am b37f7e59: Merge changes I81fc2f90,I5e7fd759Brad Fitzpatrick2011-03-151-1/+1
| |\ \ \ | | |/ /