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

35630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
e9702c3989 Split strings referring to "phone" into phone and tablet variants. 
Change-Id: I956c075a1ddeb627db0ba582a35906c9ae8f41ea
 2010-11-03 13:44:11 -07:00
Justin Ho
ade230ed99 am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
  DO NOT MERGE - Updated VPNServices stat_sys icons
 2010-11-03 13:43:09 -07:00
Justin Ho
112b5b1f30 Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread 2010-11-03 13:39:26 -07:00
Justin Ho
ccacd87a39 DO NOT MERGE - Updated VPNServices stat_sys icons 
Change-Id: I2dfb6873488460528bab68225a69cae61c215006
 2010-11-03 13:38:12 -07:00
Jeff Hamilton
1212d4fdc9 am ef569469: Merge "Remove the My Tag feature." into gingerbread 
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
  Remove the My Tag feature.
 2010-11-03 13:37:22 -07:00
Jeff Hamilton
ef5694692f Merge "Remove the My Tag feature." into gingerbread 2010-11-03 13:34:39 -07:00
Jeff Hamilton
575a6bbfe0 Remove the My Tag feature. 
Change-Id: I9167121da2fa66ddae23386d24fef7bcc64eb3f1
 2010-11-03 15:32:40 -05:00
Xavier Ducrohet
6b6fa1625a Merge "Layoutlib native delegate: primitive shapes and shaders" 2010-11-03 13:30:22 -07:00
Xavier Ducrohet
1272b4625f Merge "More layout Canvas/Paint implementation." 2010-11-03 13:30:17 -07:00
Xavier Ducrohet
251d2e9924 Layoutlib native delegate: primitive shapes and shaders 
Change-Id: Id2b0c6231589e82d8e96c9f019042eba348a6583
 2010-11-03 13:23:22 -07:00
Alexander Lucas
a11c9e1506 Added SIP Demo 
Change-Id: I418bd272b42b82b9048934071322013f62ac0635
 2010-11-03 13:11:14 -07:00
Daniel Sandler
7fb7cf4215 am 9f4f20c2: am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread 
* commit '9f4f20c2451325850cb81e886f1e76155e7e098d':
  Fix the fix for storage ANRs.
 2010-11-03 12:42:35 -07:00
Daniel Sandler
9f4f20c245 am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread 
* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
  Fix the fix for storage ANRs.
 2010-11-03 12:38:40 -07:00
Daniel Sandler
65816a32ee Merge "Fix the fix for storage ANRs." into gingerbread 2010-11-03 12:36:31 -07:00
Daniel Sandler
3a4940f3f0 Squash ANRs in UsbStorageActivity. 
Important safety tip: talking to the storage manager and
mount service can be very, very slow.

Bug: 3138068
Change-Id: I652e8bb2075535b42c83a46df1d8ae8bf299dd0d
 2010-11-03 15:25:52 -04:00
Irfan Sheriff
1997eebd62 Merge "Set country code in the driver and remove channel set" 2010-11-03 12:23:01 -07:00
Gilles Debunne
732c590ad6 Merge "Tapping in a empty textEdit shows the handle." 2010-11-03 12:21:16 -07:00
Gilles Debunne
3c5e94335a Tapping in a empty textEdit shows the handle. 
So that the user can paste in that field, by tapping on the handle.

Change-Id: Ib43291fb78ded7c9b41c52cf3030fe0144d085c3
 2010-11-03 12:19:39 -07:00
Ben Komalo
53eb6af2ac Merge "Fix issue where home layout click listener was being attached before it was initialized." 2010-11-03 12:18:40 -07:00
Adam Powell
01f706260b Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public" 2010-11-03 12:06:44 -07:00
Ben Komalo
ad199ecc44 Fix issue where home layout click listener was being attached 
before it was initialized.

Change-Id: I25641ca7c2db18d423dcafebc9bdf42d608a7a31
 2010-11-03 12:05:49 -07:00
James Dong
e0c0504c7e am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread 
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
  DO NOT MERGE
 2010-11-03 12:02:53 -07:00
Adam Powell
13fd8de5cd Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public 
Change-Id: I72aa81fee745aee67269e6b24eab0f61ed693baf
 2010-11-03 12:02:13 -07:00
Chris Tate
5f4b7d8a8a Merge "Fix drag enter/exit reporting" 2010-11-03 12:00:56 -07:00
Dianne Hackborn
a2773f51fd am 0ce0f72c: am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations." 
* commit '0ce0f72c1eb92cf654667c15477f19b4a7e84cd1':
  Revert "UMS: Avoid SystemUI ANRs during long vold operations."
 2010-11-03 11:43:16 -07:00
Daniel Sandler
dfd7e58d62 am 1df8765a: am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 
* commit '1df8765ac05ed83c212e899fa6c74a6cc012e7b0':
  UMS: Avoid SystemUI ANRs during long vold operations.
 2010-11-03 11:43:03 -07:00
Jason parks
f13b445294 am bcbf17a5: am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread 
* commit 'bcbf17a5823380b59ad5617c79c1f14d365bdc23':
  Return a zero length byte from toByteArray instead of null.
 2010-11-03 11:42:40 -07:00
Dirk Dougherty
d8c2efdcd3 am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo 
* commit '243a28ba2d58acea96a33cd6c73cb805a653863f':
  Doc change: Update uses-feature and permissions docs.
 2010-11-03 11:42:31 -07:00
Brad Fitzpatrick
41727a4592 am f3a6b901: am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements" 
* commit 'f3a6b901917b1609c6f1901bb36deb07a58fd20d':
  NotificationManager: droiddoc documentation improvements
 2010-11-03 11:42:19 -07:00
Gloria Wang
e3afc288dd resolved conflicts for merge of a8d7b747 to master 
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
 2010-11-03 11:39:04 -07:00
Amith Yamasani
74bb355736 For extra large devices, use a dialog style for LauncherActivity. 
This is used by Settings for shortcut selection.

Bug: 3154864
 2010-11-03 11:26:02 -07:00
Jaikumar Ganesh
30d181690e Add STATE_AUDIO_CONNECTING state. 
Why is it needed: SCO audio connections can fail.
Currently no indication is given to clients which are waiting
for SCO connections. This was working fine before because
SCO connections where blocking calls, which was wrong in itself.

Change-Id: Ic449b2db8506a7a5ae6be6c68715f1a7343f9e40
 2010-11-03 11:05:12 -07:00
Nick Pelly
cc82f3ae3c am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread 
* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
  Remove timeout support.
 2010-11-03 10:59:54 -07:00
Jean-Baptiste Queru
b079e7d408 am c91e4673: am bbd212d7: Merge "Document per-implementation behaviors of native get* methods" 
* commit 'c91e46730d14611fb85cd7b2d3e51dac5ce538a2':
  Document per-implementation behaviors of native get* methods
 2010-11-03 10:59:44 -07:00
Jean-Baptiste Queru
ae60b8a132 am 0b5d57ab: am 715f8610: Merge "Clarify documentation of Cursor get* methods." 
* commit '0b5d57ab7ea062af4502be5af2d51883d251c0bc':
  Clarify documentation of Cursor get* methods.
 2010-11-03 10:59:36 -07:00
Gloria Wang
8f7a0275f2 am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
  - Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
 2010-11-03 10:59:23 -07:00
Joe Malin
a7bd885738 am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 
* commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
 2010-11-03 10:59:03 -07:00
Raphael
54e460f49f am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 
* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
  Support for <compatible-screens><screen> in ADT.
 2010-11-03 10:58:47 -07:00
Gilles Debunne
1547423cc9 am a090d64a: (-s ours) am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit 'a090d64ac198b878a3ea01204298d5ed5eb8fbb8':
  Rescaled/updated mdpi assets added.
 2010-11-03 10:58:09 -07:00
Gilles Debunne
f9d7073a0e am 51b9cc04: (-s ours) am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread 
* commit '51b9cc04e816a2bd613ad624b3ed7c6f12381928':
  Rescaled/updated mdpi assets added.
 2010-11-03 10:50:29 -07:00
Bryan Mawhinney
2a3d754549 Avoid copying byte arrays when just decoding bounds. 
Currently, if a caller specifies both "purgeable" and "just decode
bounds" options when passing a byte array to decode, we create an
unnecessary copy of the byte array.  This is probably not common,
but we may as well avoid the copy.

Change-Id: I27e573b0e1fb8f8516729882a84efa02b6da08a5
 2010-11-03 17:23:57 +00:00
Jean-Baptiste Queru
42c94791b0 Merge "Fix the animation disappeared issue" 2010-11-03 10:16:30 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread 
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
 2010-11-03 09:25:08 -07:00
James Dong
f3847e875e Merge "DO NOT MERGE" into gingerbread 2010-11-03 09:21:44 -07:00
Daniel Sandler
5b8743f3d6 Fix the fix for storage ANRs. 
This repairs Icf2a836b6 to avoid an infinite loop on boot.

Bug: 3138068
Change-Id: Ic3a0455e18002dfb82774d96b3467030c4b15e2f
 2010-11-03 09:49:26 -04:00
Chih-Wei Huang
2978751310 Fix the animation disappeared issue 
The animation movie disappears due to the incorrect logic of
commit c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc.

Change-Id: I9c0eac2bf2950fe20e931da367036ddf38d81f52
 2010-11-03 15:33:00 +08:00
Dianne Hackborn
0ce0f72c1e am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations." 
* commit '906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
  Revert "UMS: Avoid SystemUI ANRs during long vold operations."
 2010-11-02 22:28:10 -07:00
Dianne Hackborn
906b830d1d Revert "UMS: Avoid SystemUI ANRs during long vold operations." 
This reverts commit 010704f95de534214cd7b86f93e22050a595dce3.
 2010-11-02 22:23:53 -07:00
Daniel Sandler
1df8765ac0 am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 
* commit 'cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
  UMS: Avoid SystemUI ANRs during long vold operations.
 2010-11-02 20:35:17 -07:00
Daniel Sandler
cbc3219d28 Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread 2010-11-02 20:34:10 -07:00