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

42133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Scott Main
796f1af045 Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-26 18:48:22 -08:00
Romain Guy
0d8f88b272 am ede54ce2: Merge "Fix crash in movie studio." into honeycomb 
* commit 'ede54ce2fe3252d4ab56b90de464b35a6920970d':
  Fix crash in movie studio.
 2011-01-26 18:47:59 -08:00
Scott Main
2518895c50 resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp 
Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab
 2011-01-26 18:47:13 -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
Scott Main
77ba255e32 am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs 
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
  enable preview mode for docs and add api level 10 flag for api level diffs
 2011-01-26 18:37:22 -08:00
Romain Guy
0518e7b5bd am 9c8307fb: Merge "Make sure that we update SurfaceView\'s window with display lists. Bug #3395487" into honeycomb 
* commit '9c8307fb19558ffe2e897bad009fb038bb9e845b':
  Make sure that we update SurfaceView's window with display lists. Bug #3395487
 2011-01-26 18:32:54 -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
0517ea2ab8 am da597b5c: Merge "Status bar visual tweaks." into honeycomb 
* commit 'da597b5c1a6553a43f1e938ef87b29c8f2a59386':
  Status bar visual tweaks.
 2011-01-26 18:19:19 -08:00
Daniel Sandler
da597b5c1a Merge "Status bar visual tweaks." into honeycomb 2011-01-26 18:17:49 -08:00
Gilles Debunne
2cb4a215ad am bc3f7937: Merge "Tabs are resized to make sure they fit in their parent." into honeycomb 
* commit 'bc3f79371bb93e075bcb91d92180487337afce17':
  Tabs are resized to make sure they fit in their parent.
 2011-01-26 18:10:58 -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
e97c01888f am 55271a79: Merge "Disable PBAP for no voice capability" into honeycomb 
* commit '55271a79d1c14e2952d550995569135a23971672':
  Disable PBAP for no voice capability
 2011-01-26 18:03:40 -08:00
Shih-wei Liao
957ee34d73 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 'b9d69d595fa17ae87b4e615c2339df64a5df8324':
  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 18:03:31 -08:00
Dianne Hackborn
280afad7c4 am 14cd455d: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '14cd455dd57f2708b63f88aab24ba6c75d13d96f':
  Import revised translations.  DO NOT MERGE
 2011-01-26 18:03:18 -08:00
Scott Main
711788bb81 am bedd2427: am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'bedd242768f7594d12bde0b4c4e7d153c27858d4':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 17:58:54 -08:00
Scott Main
bedd242768 am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 17:56:26 -08:00