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

41220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Basavapatna Dattaguru
9af5da5258 Merge "Video editor CTS: Framework modifications" into honeycomb 2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
643e8476e1 Merge "Fixes Issue ID: 3396697" into honeycomb 2011-01-26 21:47:40 -08:00
Eric Fischer
f274eaed9d am 5a40b8ef: (-s ours) Merge "Add date format and map center resources for new locales." into gingerbread 
* commit '5a40b8ef81034e00f886010c71dccd62b919028b':
  Add date format and map center resources for new locales.
 2011-01-26 21:44:48 -08:00
Justin Ho
08006286b4 Merge "New stat_sys_download/upload icons" into honeycomb 2011-01-26 21:37:22 -08:00
Justin Ho
3af3719615 New stat_sys_download/upload icons 
Change-Id: I8f2f8e2a097ea4b52e95429aa8bbd29177385c3d
 2011-01-26 21:34:14 -08:00
Jeff Hamilton
7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge 
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
 2011-01-26 23:26:16 -06:00
Wei-Ta Chen
50234d7dcd am 61d9ffbf: (-s ours) Merge "Do not merge." into gingerbread 
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.
 2011-01-26 21:14:34 -08:00
Jeff Hamilton
c2981f4fbd resolved conflicts for merge of 4330b146 to honeycomb-merge 
Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
 2011-01-26 23:09:13 -06:00
Jeff Brown
8d6d3b83fb Fix down arrow in AutoCompleteTextView. 
Bug: 3337416
Change-Id: I572d55c973b9adc68765ba02197e84f3558e65bc
 2011-01-26 21:08:53 -08:00
Basavapatna Dattaguru
eb6d6ecf4b Video editor CTS: Framework modifications 
Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
 2011-01-26 20:58:56 -08:00
James Dong
3b1fd35c68 Merge "Eliminate duplicated code in export method" into honeycomb 2011-01-26 20:42:18 -08:00
Nick Pelly
6165985652 am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
 2011-01-26 20:40:46 -08:00
Kenny Root
558f8b8676 am e8c04db7: (-s ours) Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
 2011-01-26 20:40:17 -08:00
Basavapatna Dattaguru
8b9ba61644 Fixes Issue ID: 3396697 
Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
 2011-01-26 20:31:11 -08:00
Kenny Root
5d506fa727 Merge "Add API for preferred Launcher icon size and density" into honeycomb 2011-01-26 20:16:31 -08:00
James Dong
20586a128c Eliminate duplicated code in export method 
bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
 2011-01-26 20:15:49 -08:00
Xavier Ducrohet
62461d128f Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb 2011-01-26 19:54:46 -08:00
Kenny Root
5ef44b7566 Add API for preferred Launcher icon size and density 
Applications that create an icon for launcher to use couldn't determine
which size or density the icon should be created.

Bug: 3224340
Change-Id: Iee96113a4092696a9bd18eecbd2593b38f952a16
 2011-01-26 19:43:27 -08:00
Jim Miller
57d472a5b1 Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb 2011-01-26 19:39:23 -08:00
Justin Ho
597e644d7a Merge "Integrating xlarge mdpi battery charging assets" into honeycomb 2011-01-26 19:34:50 -08:00
Jeff Brown
f0a3cc5a5f Handle ActivityNotFoundException in the WM policy. 
When invoking a registered shortcut for which the activity was not
found, the startActivity throws ActivityNotFoundException.  If this
exception is not caught and handled, then the shortcut key is
dispatched to the application instead of being suppressed as it
should have been.

Found while fixing Bug: 3396233

Change-Id: I0e8e9e3ba09dd403a901d5eae12839734be467ed
 2011-01-26 19:32:07 -08:00
Justin Ho
c0e8565298 Integrating xlarge mdpi battery charging assets 
Change-Id: Iec541ec384fcf69d7de0c2a75031714d0d232f2a
 2011-01-26 19:31:45 -08:00
Michael Kolb
85fd2c9102 Merge "fix incognito url loading" into honeycomb 2011-01-26 19:21:49 -08:00
Michael Kolb
2c8b1f77a3 fix incognito url loading 
http://b/issue?id=3349090
    removed the loading of the "browser:incognito" url

Change-Id: I47f952d372b4d69e91d4b29b3b5e5ec46a4f4fc3
 2011-01-26 19:16:11 -08:00
Dianne Hackborn
2dc9c784b2 Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 2011-01-26 19:04:15 -08:00
Jim Miller
8996cf071a Fix 3381324: Restart ripples when the user moves away from the edge. 
This changes the behavior of WaveView to start waves again when
the user moves the halo back towards the center.

Change-Id: Ia3b8fbd091e90e83e0c34b98a3060d3236191d7a
 2011-01-26 19:03:49 -08:00
Dianne Hackborn
63042d6a03 Fix issue #3382992: IME close animation stutters from URL bar 
Gross hack is grosser.

Change-Id: I0a34bf1d7c16c547402318f24776a5f7e8b7552b
 2011-01-26 18:56:29 -08:00
Romain Guy
ede54ce2fe Merge "Fix crash in movie studio." into honeycomb 2011-01-26 18:46:29 -08:00
Romain Guy
0c75622cf8 Fix crash in movie studio. 
Change-Id: I06acb0b39cc3839cf7abb58b32dec9b9bec424d6
 2011-01-26 18:48:38 -08:00
Romain Guy
f2499fa434 Make sure that we update SurfaceView's window with display lists. 
Bug #3395487

Change-Id: Idaef3953a596ee3b4049a2d8aef6dda676b1545b
 2011-01-26 18:31:23 -08:00
Scott Main
ba3dd32357 enable preview mode for docs and add api level 10 flag for api level diffs 
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
 2011-01-26 18:29:50 -08:00
Romain Guy
9c8307fb19 Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487" into honeycomb 2011-01-26 18:29:38 -08:00
Daniel Sandler
da597b5c1a Merge "Status bar visual tweaks." into honeycomb 2011-01-26 18:17:49 -08:00
Gilles Debunne
bc3f79371b Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 2011-01-26 18:09:23 -08:00
Jaikumar Ganesh
55271a79d1 Merge "Disable PBAP for no voice capability" into honeycomb 2011-01-26 17:52:50 -08:00
Scott Main
a7ce2f04ef Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 2011-01-26 17:52:08 -08:00
Shih-wei Liao
b9d69d595f Merge "For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do on-device linking, STATIC no longer makes sense. (b/2943524)" into honeycomb 2011-01-26 17:43:13 -08:00
Scott Main
9e6c0686be catchup the gingerbread branch to gingerbread-docs for all sdk docs 
This is just a manual copy of all files that changed, rather than a dozen cherry picks.

Change-Id: I672f74a2ec9242a1d96713d1d84bfc4d2d47dd85
 2011-01-26 17:42:49 -08:00
Dianne Hackborn
14cd455dd5 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-26 17:38:57 -08:00
Xavier Ducrohet
31fd1cf769 LayoutLib: put a default image on the quickcontactbadge. 
Change-Id: I64b3f4004801ec03f374460384f9a492e66bfaf0
 2011-01-26 17:30:59 -08:00
Wink Saville
13a8f2a59c Merge "Comment out the isAvailable optimization." into honeycomb 2011-01-26 17:29:32 -08:00
Scott Main
0f2e2b8b82 Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description." into honeycomb 2011-01-26 17:06:45 -08:00
Shih-wei Liao
26e5ff8a67 For rs_cl, fix _RS_STATIC (used while we do on-host linking). Now we do 
on-device linking, STATIC no longer makes sense. (b/2943524)

Change-Id: Ia35f90eb0956b1cd6c436a1482d87d82f41cedc9
 2011-01-26 17:04:31 -08:00
Mike Lockwood
e797b82c76 Revert "getRingtone is causing an anr. Turn it off for now." 
ANR doesn't seem to be happening any more.

BUG: 3142881

This reverts commit c597ba8e9ad08ac628271b4498c27eda74c6c86c.

Change-Id: Ib6eb407c700bc9a8460f49394ec71d75d14588e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-26 17:00:51 -08:00
Xavier Ducrohet
ee37ab8dce Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb 2011-01-26 16:52:49 -08:00
Xavier Ducrohet
5a82d8c58b LayoutLib: properly erase the bitmap when rendering a new session. 
This fix the issue where going from a full theme to a dialog theme
would show the dialog on top of the previous rendering.

Change-Id: Ib52b9719f44b04969423547b9de8d039f90b6f46
 2011-01-26 16:34:53 -08:00
Eric Fischer
706a4fcb10 Import revised translations. DO NOT MERGE 
Change-Id: Ibc22cd39b0a708a8188b0a52660f484682762ef5
 2011-01-26 16:29:34 -08:00
Dianne Hackborn
93257271ad Merge "Remove xlarge specific icon size" into honeycomb 2011-01-26 16:28:46 -08:00
Dianne Hackborn
8c0ac87087 Merge "Fix another part of #3387855: Menu flashes on left side of screen" into honeycomb 2011-01-26 16:27:40 -08:00
Dianne Hackborn
428ecb65b5 Fix another part of #3387855: Menu flashes on left side of screen 
When task switching while dialog windows were up, the exit animation
wouldn't be seen.  The animation needs to force Z-order its windows
to the top.

Also fix a bug where the lock screen fade-out was immediately
Z-ordering the wallpaper to the bottom if the activity behind was
not on top of the wallpaper.

Change-Id: Icd45cd8ccfff9829822c1682931413246eb9601b
 2011-01-26 16:26:48 -08:00