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

43097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Basavapatna Dattaguru
e9ad1bf4ed am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
  Video editor CTS: Framework modifications
 2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
497c56f67f am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
  Fixes Issue ID: 3396697
 2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
a33537c3f1 am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications
 2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
55bf9bdbcb am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697
 2011-01-26 21:49:34 -08:00
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
Justin Ho
b4bb2be539 am 5d15cc71: am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb 
* commit '5d15cc7174388af04a9897c03bcd7e4d81e578b2':
  New stat_sys_download/upload icons
 2011-01-26 21:44:22 -08:00
Justin Ho
5d15cc7174 am 08006286: Merge "New stat_sys_download/upload icons" into honeycomb 
* commit '08006286b40cf9031766a97e4d50ebb47c8b514d':
  New stat_sys_download/upload icons
 2011-01-26 21:41:50 -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
James Dong
d4d138a064 am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
  Eliminate duplicated code in export method
 2011-01-26 21:20:16 -08:00
Kenny Root
d01d1dd7d5 am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb 
* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
  Add API for preferred Launcher icon size and density
 2011-01-26 21:19:59 -08:00
Xavier Ducrohet
c1a92cf0a5 am 8c7fd1e9: am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb 
* commit '8c7fd1e96a012c6ebc8bdf1b38df7667456b8fcb':
  LayoutLib: put a default image on the quickcontactbadge.
 2011-01-26 21:19:42 -08:00
Jim Miller
aa5390ffb1 am df82ad9f: am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb 
* commit 'df82ad9fb239572f3076ffc8894697b9de3d18d1':
  Fix 3381324: Restart ripples when the user moves away from the edge.
 2011-01-26 21:19:36 -08:00
Justin Ho
f20c63555d am 5b78e092: am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb 
* commit '5b78e092dd7a97c47169f3442e73c1c934002cbc':
  Integrating xlarge mdpi battery charging assets
 2011-01-26 21:19:30 -08:00
Michael Kolb
1462293c16 am cda2da1f: am 85fd2c91: Merge "fix incognito url loading" into honeycomb 
* commit 'cda2da1f23f7be6dd2c41746a49ff41bf66958df':
  fix incognito url loading
 2011-01-26 21:19:20 -08:00
James Dong
f1e687b6e3 am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
  Eliminate duplicated code in export method
 2011-01-26 21:15:37 -08:00
Kenny Root
1f8e2f9958 am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb 
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
  Add API for preferred Launcher icon size and density
 2011-01-26 21:15:28 -08:00
Xavier Ducrohet
8c7fd1e96a am 62461d12: Merge "LayoutLib: put a default image on the quickcontactbadge." into honeycomb 
* commit '62461d128fcb1314d96661e77f9744e5e50f57e3':
  LayoutLib: put a default image on the quickcontactbadge.
 2011-01-26 21:15:22 -08:00
Jim Miller
df82ad9fb2 am 57d472a5: Merge "Fix 3381324: Restart ripples when the user moves away from the edge." into honeycomb 
* commit '57d472a5b1f69e3aa0159f41c7ef625d4418c27f':
  Fix 3381324: Restart ripples when the user moves away from the edge.
 2011-01-26 21:15:17 -08:00
Justin Ho
5b78e092dd am 597e644d: Merge "Integrating xlarge mdpi battery charging assets" into honeycomb 
* commit '597e644d7a445e6f5555f3f51b6ed78b1e6c1243':
  Integrating xlarge mdpi battery charging assets
 2011-01-26 21:15:10 -08:00
Michael Kolb
cda2da1f23 am 85fd2c91: Merge "fix incognito url loading" into honeycomb 
* commit '85fd2c9102f7cf105bf498f05ca35360a4bcede5':
  fix incognito url loading
 2011-01-26 21:15:01 -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
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
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
Dianne Hackborn
166f26e2c2 am f35d43f9: am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 
* commit 'f35d43f90b9e4553343a59b217430aaba91b0d1f':
  Fix issue #3382992: IME close animation stutters from URL bar
 2011-01-26 19:17:46 -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
Scott Main
66f3ca1c05 am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '796f1af04567dab098f638c9166caebc2818efe4':
  enable preview mode for docs and add api level 10 flag for api level diffs
 2011-01-26 19:13:54 -08:00
Romain Guy
3a6b7be25d am 0d8f88b2: am ede54ce2: Merge "Fix crash in movie studio." into honeycomb 
* commit '0d8f88b272f80f2a3594d2d988faabed4e540631':
  Fix crash in movie studio.
 2011-01-26 19:13:50 -08:00
Romain Guy
b5fb99ff4d am 0518e7b5: am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487" into honeycomb 
* commit '0518e7b5bddfdeb010591c736fb080009a99cd14':
  Make sure that we update SurfaceView's window with display lists. Bug #3395487
 2011-01-26 19:13:40 -08:00
Daniel Sandler
063d4d7a3a am 0517ea2a: am da597b5c: Merge "Status bar visual tweaks." into honeycomb 
* commit '0517ea2ab8e4dae5fe2394cfecced6afb121b95e':
  Status bar visual tweaks.
 2011-01-26 19:13:33 -08:00
Gilles Debunne
2c29f2843a am 2cb4a215: am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 
* commit '2cb4a215ad3d42fe9b90a1b045d5ce1c3d09bf9d':
  Tabs are resized to make sure they fit in their parent.
 2011-01-26 19:13:24 -08:00
Jaikumar Ganesh
6312927254 am e97c0188: am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb 
* commit 'e97c01888fcc94453041eb6adc575598d744b580':
  Disable PBAP for no voice capability
 2011-01-26 19:11:20 -08:00
Shih-wei Liao
783d0db712 am 957ee34d: am b9d69d59: 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 
* commit '957ee34d73e6b0bec91edaad57be641834855758':
  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)
 2011-01-26 19:11:15 -08:00
Dianne Hackborn
d26b1a3bc0 am 280afad7: (-s ours) am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '280afad7c406a0d2bba966448c8b388d7f726b8a':
  Import revised translations.  DO NOT MERGE
 2011-01-26 19:11:09 -08:00
Scott Main
3205206b81 am 711788bb: am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit '711788bb81cfb8b62e9bd7284f01a1d2b55fac8d':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 19:10:38 -08:00
Wink Saville
de5d85d10e am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb 
* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
  Comment out the isAvailable optimization.
 2011-01-26 19:09:22 -08:00
Scott Main
c42eb2cce7 am d2b87091: am 0f2e2b8b: 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 
* commit 'd2b87091cc30c575496eb78ebea88297da775359':
  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.
 2011-01-26 19:08:55 -08:00
Andreas Huber
e3041e19c9 am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
* commit 'c296b5738947003c96dfc5b93c86f27b955429ff':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 19:08:49 -08:00
Jeff Brown
01f30731fe am 6774b1c5: am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps." 
* commit '6774b1c5920be3f5be8ce2d5b5c0f620bd271dbc':
  Move keymaps from sdk/emulator/keymaps.
 2011-01-26 19:08:42 -08:00
Dianne Hackborn
f35d43f90b am 2dc9c784: Merge "Fix issue #3382992: IME close animation stutters from URL bar" into honeycomb 
* commit '2dc9c784b2fab67a8233318f559e65f444bf0c97':
  Fix issue #3382992: IME close animation stutters from URL bar
 2011-01-26 19:08:20 -08:00
Xavier Ducrohet
3d0d9937c5 am 73b58c0b: am ee37ab8d: Merge "LayoutLib: properly erase the bitmap when rendering a new session." into honeycomb 
* commit '73b58c0bd9faf99b19c1fcfe5bcf94cebd65634e':
  LayoutLib: properly erase the bitmap when rendering a new session.
 2011-01-26 19:08:20 -08:00