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

41775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Amith Yamasani
04e5dcdd64 am 672f4ef3: Merge "Sync activity picker to latest dialog style." into honeycomb 
* commit '672f4ef34801ddc788b2fe4ca41da58147ba1234':
  Sync activity picker to latest dialog style.
 2011-01-21 08:45:09 -08:00
Justin Ho
1fc1a381e6 am 09358f00: Integrating Gingerbread phone lockscreen assets 
* commit '09358f00fd87cd5a9fc143a0376c228f11881fa1':
  Integrating Gingerbread phone lockscreen assets
 2011-01-21 08:43:08 -08:00
Amith Yamasani
672f4ef348 Merge "Sync activity picker to latest dialog style." into honeycomb 2011-01-21 08:42:18 -08:00
Justin Ho
09358f00fd Integrating Gingerbread phone lockscreen assets 
Change-Id: Id13942e4e516b3744d89521898c55566fd39fc35
 2011-01-21 08:40:14 -08:00
Glenn Kasten
0bda68b375 Merge "Bug 3361124 Remove drmioserver" 2011-01-21 07:49:19 -08:00
Justin Ho
58a4636f53 am 6d495a67: Resized btn_radio buttons from Gingerbread for legacy apps 
* commit '6d495a67fcf52b3c2d99443ca25e4df6bceaf07a':
  Resized btn_radio buttons from Gingerbread for legacy apps
 2011-01-21 07:45:43 -08:00
Justin Ho
6d495a67fc Resized btn_radio buttons from Gingerbread for legacy apps 
Change-Id: I1d2bef3e08e48c4a36c8311c076bdbe9fa0b3725
 2011-01-21 07:40:49 -08:00
satok
026de9ed7f am 6a0d924e: Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb 
* commit '6a0d924e61cdb03ba63e06aeb950b1e21f5bf72f':
  Show implicitly enabled subtypes in the input method selection dialog
 2011-01-21 03:39:48 -08:00
satok
6a0d924e61 Merge "Show implicitly enabled subtypes in the input method selection dialog" into honeycomb 2011-01-21 03:37:49 -08:00
satok
bb4aa0683c Show implicitly enabled subtypes in the input method selection dialog 
bug: 3367646

Change-Id: I9550f17f163950d80113fbcb8c9dd8a7d014cf6a
 2011-01-21 20:20:02 +09:00
Santosh Madhava
10fcc6f500 am ff23e4d7: Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb 
* commit 'ff23e4d7f872df4d5880e69cc3742fc08d66f00b':
  Fix for issue 3370052 : Export progress percentage is incorrect
 2011-01-20 23:46:27 -08:00
Santosh Madhava
f82856f3d2 am 95788cf4: Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb 
* commit '95788cf478d177d6748c40d4ce725fb4f93aec82':
  Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
 2011-01-20 23:46:23 -08:00
Santosh Madhava
ff23e4d7f8 Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb 2011-01-20 23:44:29 -08:00
Santosh Madhava
95788cf478 Merge "Fix for PR 3369866 : Project thumbnail should have the same aspect ratio" into honeycomb 2011-01-20 23:44:05 -08:00
Shih-wei Liao
602aec6b5e am f1f71053: Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb 
* commit 'f1f710538e4d6388611145e66afc9dd934fa97cc':
  Handle fatal errors from calling bccRegisterSymbolCallback (if any).
 2011-01-20 23:12:47 -08:00
Shih-wei Liao
f1f710538e Merge "Handle fatal errors from calling bccRegisterSymbolCallback (if any)." into honeycomb 2011-01-20 23:10:39 -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
Jason parks
8888c597c4 Add and enforce the permission for encrypting/decrypting. 
Change-Id: Ia292d8a5981266c2703743beb79fd786d77b375d
 2011-01-21 00:07:49 -06:00
Jason parks
9ed98bcdc9 Update encryption commands. 
* Changed to inplace encryption.
* Changed decryption to return the proper error code. It will now return success or the number of failed attempts.
* Be lazy and post a message 2 seconds later to call restart. I don't feel like messing with binder interfaces for a proper callback.

Change-Id: Iae2de7057aa66f248fd2df3f29777ad3368442f0
 2011-01-21 00:06:20 -06: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
Scott Main
535ad65e54 am 0f805632: cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits 
* commit '0f8056321f4d4552fb96a671c3cd194814ad0d4e':
  cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits
 2011-01-20 21:42:23 -08:00
Scott Main
244c10b0d8 am 77d6fcff: cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at 
* commit '77d6fcff7b97b53d7bf15557e117d32b95c21f63':
  cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 docs: update supports-screens doc with xlargescreens attribute... we updated the Supporting Multiple Screens document with this attribute for gingerbread, but this document was not updated at that time.
 2011-01-20 21:42:18 -08:00
Robert Ly
16c0a0f638 am edc2aac7: cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview 
* commit 'edc2aac7bf75ce0fb17ab9f83cb2d02d825f829f':
  cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 Doc change: Updating ndk/sdk/tools overview pages for hc preview
 2011-01-20 21:42:13 -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
Scott Main
0f8056321f cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 
docs: add OEM USB Drivers document
and update install guide with windows 7 procedures
misc style edits

Change-Id: Icadbfc1136463a75039f87e7c0cbc79d29afbd84
 2011-01-20 18:37:41 -08:00
Scott Main
77d6fcff7b cherrypick Change-Id: I8c52dbe5ac04dfeb1b466b163ae3aec5dc401175 
docs: update supports-screens doc with xlargescreens attribute...
we updated the Supporting Multiple Screens document with this attribute
for gingerbread, but this document was not updated at that time.

Change-Id: I946e7eb8b93cee1a7223d400c882f415d6045815
 2011-01-20 18:33:51 -08:00
Stephen Hines
536f525ddb am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb 
* commit '47171a7b65d841ed27940bb961f7934770c69440':
  Properly use Long2 for "UInt2" for FieldPacker.
 2011-01-20 18:31:39 -08:00
Scott Main
0cf6d22a67 am 924e3528: Merge "docs: add getting started doc and version notes for HC preview" into honeycomb 
* commit '924e352875849acc30ff87355e80b96a20e78eca':
  docs: add getting started doc and version notes for HC preview
 2011-01-20 18:31:22 -08:00
Robert Ly
edc2aac7bf cherry pick Change-Id: I30e939d1dd5603a05070486c8a43187bedef52a4 
Doc change: Updating ndk/sdk/tools overview pages for hc preview

Change-Id: I7e5feecc645be48e92d1f4a6d80f86ddb98e48b9
 2011-01-20 18:30:42 -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
Stephen Hines
47171a7b65 Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb 2011-01-20 18:27:43 -08:00
Scott Main
924e352875 Merge "docs: add getting started doc and version notes for HC preview" into honeycomb 2011-01-20 18:27:41 -08:00
Scott Main
7fb538cc77 docs: add getting started doc and version notes for HC preview 
Change-Id: Ia969c54a9b57197fb0f8814cc1898e50c02608e0
 2011-01-20 18:26:43 -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
Stephen Hines
e9f5c1894b Properly use Long2 for "UInt2" for FieldPacker. 
We were misusing this API, since it requires the additional precision of
the next size up on unsigned versions of types.

Change-Id: Ic3c87f681ac6705ae0b36a3464ce0d63737945fd
 2011-01-20 18:17:25 -08:00