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

14818 Commits

Author SHA1 Message Date
Nick Pelly
0967c1cbc5 am 11ce84fc: resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp 
* commit '11ce84fcaadb7051735dd50a35f6e6c234fbe480':
  Javadoc updates for NFC.
 2011-01-21 11:02:35 -08:00
Nick Pelly
d42cdbe6f7 am df80645a: Merge "resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp"" into honeycomb-plus-aosp 
* commit 'df80645a97d994f20a9fba1311a884bf17d2b774':
  New APIs for NDEF Push Protocol.
 2011-01-21 11:02:16 -08:00
Ken Wakasa
ed19b88fe2 am 6ddec8be: am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb 
* commit '6ddec8be1cc23f4b7e8793503420072024884072':
  Update class doc for InputMethodSubtype
 2011-01-21 11:00:46 -08:00
Brad Fitzpatrick
6700447200 am ca87f0e8: am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb 
* commit 'ca87f0e832f71226839004c8e854e1389c037234':
  StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
 2011-01-21 11:00:20 -08:00
satok
6a32272af5 am d57c1fcf: am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 
* commit 'd57c1fcf5a4f8fd9451e4a09aa50ed14c7f94ff2':
  Show ime switch icon when there is a hard keyboard
 2011-01-21 10:59:32 -08:00
Adam Cohen
047106d436 am f95a963e: am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb 
* commit 'f95a963e7313b209ab3da5eeac1bde385bca4355':
  Cleaning up some StackView bad behavior
 2011-01-21 10:59:20 -08:00
Romain Guy
d0417fa04e am 8e2d489a: am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb 
* commit '8e2d489a868d52a979eed91a13a7605630ac997c':
  Add support for drawBitmapMesh().
 2011-01-21 10:59:07 -08:00
Jim Miller
252d95086a am be71a923: am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 
* commit 'be71a923b084accde4c2b3ff74b2454bc6894eb6':
  Fix 3374446: Allow multiple shift keys in Keyboard.
 2011-01-21 10:58:58 -08:00
Adam Powell
57cb1b8f4f am b6b47116: am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 
* commit 'b6b4711648d83cccebe52142c4efefaa67f4dc65':
  SearchView API Review - bug 3370353 and bug 3370338
 2011-01-21 10:58:45 -08:00
Scott Main
d7bfa435f5 am 437bf22d: am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb 
* commit '437bf22d0f177eea06a0ab8fe9e51ebe5f9bef11':
  docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
 2011-01-21 10:48:16 -08:00
Dianne Hackborn
91478bbb00 am d79b8b17: am 27044f1d: Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb 
* commit 'd79b8b173c39d7a556c6c49b42c11f7c0f56172b':
  Fix issue #3352125: Crash after clearing search query
 2011-01-21 10:48:03 -08:00
Nick Pelly
11ce84fcaa resolved conflicts for merge of 97ac2935 to honeycomb-plus-aosp 
Change-Id: I5b510a3598adf17b738ecfe6bf8fbc47f7111350
 2011-01-21 09:41:40 -08:00
Nick Pelly
8f912d1202 resolved conlifcts for merge of 8c1cd157 to "honeycomb-plus-aosp" 
Conflicts:
	api/current.xml

Change-Id: Ib6556fa54f49d4b55719dae79662d54f1530e76e
 2011-01-21 08:55:38 -08:00
Ken Wakasa
6ddec8be1c am ccbdf5e8: Merge "Update class doc for InputMethodSubtype" into honeycomb 
* commit 'ccbdf5e838eb44a1920c2c02fcf4190880a3c540':
  Update class doc for InputMethodSubtype
 2011-01-20 23:09:34 -08:00
Ken Wakasa
ccbdf5e838 Merge "Update class doc for InputMethodSubtype" into honeycomb 2011-01-20 23:07:53 -08:00
Ken Wakasa
e31e942455 Update class doc for InputMethodSubtype 
bug: 3370290
Change-Id: Ib86f81c1a5f6c9acca34b586d810c6e94db1b552
 2011-01-21 15:57:37 +09:00
Brad Fitzpatrick
ca87f0e832 am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb 
* commit '6828656220f4ed5ae803e4c11fb75fb56bc3ea25':
  StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
 2011-01-20 22:26:50 -08:00
Brad Fitzpatrick
6828656220 Merge "StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties" into honeycomb 2011-01-20 22:24:18 -08:00
satok
d57c1fcf5a am 0e5bf505: Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 
* commit '0e5bf5051b02bc382fb7e6c975511af499b31624':
  Show ime switch icon when there is a hard keyboard
 2011-01-20 21:44:59 -08:00
Adam Cohen
f95a963e73 am cdd5626d: Merge "Cleaning up some StackView bad behavior" into honeycomb 
* commit 'cdd5626da62cb2dc013cded470e264232617f635':
  Cleaning up some StackView bad behavior
 2011-01-20 21:42:45 -08:00
Romain Guy
8e2d489a86 am 99d49118: Merge "Add support for drawBitmapMesh()." into honeycomb 
* commit '99d49118b857df4051a864b35254e275bc8a68b6':
  Add support for drawBitmapMesh().
 2011-01-20 21:42:40 -08:00
Jim Miller
be71a923b0 am 055e56ee: Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 
* commit '055e56ee1bf62d9dc97ba3b483c79312e2bb2beb':
  Fix 3374446: Allow multiple shift keys in Keyboard.
 2011-01-20 21:42:36 -08:00
Adam Powell
b6b4711648 am 9a161b09: Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 
* commit '9a161b0981ad41169d006186979b7648a2acfd56':
  SearchView API Review - bug 3370353 and bug 3370338
 2011-01-20 21:42:31 -08:00
satok
0e5bf5051b Merge "Show ime switch icon when there is a hard keyboard" into honeycomb 2011-01-20 19:47:43 -08:00
Adam Cohen
cdd5626da6 Merge "Cleaning up some StackView bad behavior" into honeycomb 2011-01-20 19:42:23 -08:00
satok
865b97761c Show ime switch icon when there is a hard keyboard 
Change-Id: Ife3a8733b1a1bf43b195ecf4b8c5082b6538d0a0
 2011-01-21 12:28:01 +09:00
Romain Guy
99d49118b8 Merge "Add support for drawBitmapMesh()." into honeycomb 2011-01-20 19:07:28 -08:00
Romain Guy
5a7b466a2b Add support for drawBitmapMesh(). 
Change-Id: Ic77f9c534bb90dc7b9458299544bd50b8b6ae6a5
 2011-01-20 19:09:30 -08:00
Jim Miller
055e56ee1b Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb 2011-01-20 18:51:12 -08:00
Adam Powell
9a161b0981 Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb 2011-01-20 18:44:32 -08:00
Adam Powell
01f2135465 SearchView API Review - bug 3370353 and bug 3370338 
Renaming as per API council review

Change-Id: Id889be5a708fdc295ee50bb1b05014b2ff72122c
 2011-01-20 18:30:10 -08:00
Jim Miller
6465f77537 Fix 3374446: Allow multiple shift keys in Keyboard. 
This fixes a bug introduced in 3c6dd8f9 because we now
have two shift keys. The code now tracks a global state
and looks for up to two shift keys.

Update after review and added code to handle extra
invalidate required by additional shift key.

Change-Id: Ic1728dd0ceec089089cd1beca1b0b30565d6e658
 2011-01-20 18:20:12 -08:00
Adam Cohen
ef17dd497e Cleaning up some StackView bad behavior 
-> Issue: 3363564, 3320865

Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
 2011-01-20 17:36:27 -08:00
Brad Fitzpatrick
9e9d886b27 am 7204528e: am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb 
* commit '7204528e71145e34bedd6cfb13110eb872d8a968':
  Fixes for StrictMode instance count checking.
 2011-01-20 17:26:29 -08:00
Dianne Hackborn
4789b873a6 am 8a545b9e: am e69e0fde: Merge "Fix issue #3374356: Buttons sometimes don\'t highlight" into honeycomb 
* commit '8a545b9e3f67fedcb18f3ab9de00e8003a7fcd51':
  Fix issue #3374356: Buttons sometimes don't highlight
 2011-01-20 17:26:21 -08:00
Adam Powell
1bc9e6cbb1 am 8bbec794: am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '8bbec794473f802d4d61613f77bc69a582e3fcc0':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:25:55 -08:00
Christopher Tate
3e09d42b2b am 9424bfa9: am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events 
* commit '9424bfa91dd5686187d0e9611c17851dae580f52':
  Include the local state obj in ACTION_DRAG_STARTED events
 2011-01-20 17:25:50 -08:00
Joe Onorato
909ac9edc4 am 2d821b8c: am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb 
* commit '2d821b8cb8a3c11f2cde662d48890e81430b7f8d':
  Don't log the full stack trace when we can't load a resource.
 2011-01-20 17:25:25 -08:00
Scott Main
437bf22d0f am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb 
* commit 'cfaa9c152cf7fbdf13b41876422fdfe9bffa3c2a':
  docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
 2011-01-20 17:14:55 -08:00
Dianne Hackborn
d79b8b173c am 27044f1d: Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb 
* commit '27044f1d4c5765388a745527b220a3a574c4f834':
  Fix issue #3352125: Crash after clearing search query
 2011-01-20 17:14:41 -08:00
Brad Fitzpatrick
7204528e71 am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb 
* commit '9358bd39dc8829ef8413294da70d44cd928ca878':
  Fixes for StrictMode instance count checking.
 2011-01-20 17:07:41 -08:00
Dianne Hackborn
8a545b9e3f am e69e0fde: Merge "Fix issue #3374356: Buttons sometimes don\'t highlight" into honeycomb 
* commit 'e69e0fde6cf0e6302d5a05363a3db7a9c555e9dc':
  Fix issue #3374356: Buttons sometimes don't highlight
 2011-01-20 17:07:31 -08:00
Adam Powell
8bbec79447 am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb 
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
  Fix bug 3362375 - API REVIEW: remove unused public 'up' id
 2011-01-20 17:06:35 -08:00
Christopher Tate
9424bfa91d am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events 
* commit '7fb8b565f9cd2ec6a63ff4d8a89f98f68a1a138c':
  Include the local state obj in ACTION_DRAG_STARTED events
 2011-01-20 17:05:57 -08:00
Scott Main
cfaa9c152c Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb 2011-01-20 17:04:48 -08:00
Joe Onorato
2d821b8cb8 am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb 
* commit '913d04aa3b187beffd7691acb1e61a8b09810bbe':
  Don't log the full stack trace when we can't load a resource.
 2011-01-20 17:04:13 -08:00
Dianne Hackborn
27044f1d4c Merge "Fix issue #3352125: Crash after clearing search query" into honeycomb 2011-01-20 16:57:34 -08:00
Brad Fitzpatrick
c0bb0bb5e3 StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties 
Change-Id: I1b2531b66d09c850519af17918aed8be9853ef3b
 2011-01-20 16:29:52 -08:00
Brad Fitzpatrick
9358bd39dc Merge "Fixes for StrictMode instance count checking." into honeycomb 2011-01-20 15:56:47 -08:00
Dianne Hackborn
e69e0fde6c Merge "Fix issue #3374356: Buttons sometimes don't highlight" into honeycomb 2011-01-20 15:38:14 -08:00