ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,954 Commits 2 Branches 0 Tags 54 MiB
22b03897a8
Commit Graph

24954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Bornstein
22b03897a8 Fix newlines in this file. 
They were CRLF instead of just LF.

Change-Id: I2d06d19b4d8ca969527d93bd996103c161e48a79
 2010-12-07 16:23:05 -08:00
Adam Powell
a6222b5306 Merge "Clean up button bar styles" 2010-12-06 17:41:47 -08:00
Dan Bornstein
aa2a7ce98b Merge "Propagate the concept of "packed opcode" values." 2010-12-06 17:25:44 -08:00
Scott Main
249d8e5163 Merge "cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a Do not merge: Doc change: API diff report for gingerbread." 2010-12-06 17:24:24 -08:00
Scott Main
e6b8cae7d5 Merge "cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563 Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform." 2010-12-06 17:22:48 -08:00
Robert Greenwalt
860de4844a Merge "Make Proxy change broadcast sticky" 2010-12-06 16:51:32 -08:00
James Dong
cc212759db am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames may not be released 
* commit '23b791cd0f725d188b84dabfd9eeab4e3775b869':
  Fixed a race condition where some recording frames may not be released
 2010-12-06 16:45:08 -08:00
Jean-Baptiste Queru
eb7e7e6783 am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
  Changing connect and response timeout.
 2010-12-06 16:44:50 -08:00
James Dong
02524f3b89 am d57fbe88: Fixed a race condition where some recording frames may not be released 
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
  Fixed a race condition where some recording frames may not be released
 2010-12-06 15:36:04 -08:00
Brian Carlstrom
8cb2062740 Merge "Tracking dalvik.bytecode.* API changes" 2010-12-06 15:30:34 -08:00
Jesse Wilson
7b9a5af824 Merge "Test that we use proxies specified by system properties." 2010-12-06 15:24:28 -08:00
Fred Quintana
664ceeeb43 Merge "make sure that pending operation reconstituted from disk always have an extras bundle" 2010-12-06 15:18:58 -08:00
Jean-Baptiste Queru
86705c7804 Merge "Merge from gingerbread-plus-aosp" 2010-12-06 14:33:03 -08:00
Wei-Ta Chen
aae96409ac Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options." 2010-12-06 14:32:32 -08:00
Jean-Baptiste Queru
e389632fe7 Merge from gingerbread-plus-aosp 
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
 2010-12-06 14:31:25 -08:00
Jean-Baptiste Queru
02bf8be47f Merge "Merge from gingerbread-plus-aosp" 2010-12-06 14:21:07 -08:00
James Dong
74d65f40d1 Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created." 2010-12-06 14:18:18 -08:00
Jean-Baptiste Queru
1f77831f21 Merge from gingerbread-plus-aosp 
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
 2010-12-06 14:08:53 -08:00
Gilles Debunne
4568aaa9dc Merge "Moved Paste popup window up in TextView" 2010-12-06 13:57:47 -08:00
Jean-Baptiste Queru
13fd790454 am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
  Changing connect and response timeout.
 2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
64b556bdc9 am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
  Changing connect and response timeout.
 2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
58b879a8f6 Merge "Changing connect and response timeout." 2010-12-06 13:39:19 -08:00
Irfan Sheriff
e166ea9ebf Merge "Update scan results when frequency band is set" 2010-12-06 12:47:31 -08:00
Nick Pelly
68edd6222e am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread 
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
  First implementation of MifareUltralight
 2010-12-06 11:55:08 -08:00
Nick Pelly
5f87205146 resolved conflicts for merge of 28e8c66d to master 
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
 2010-12-06 11:50:47 -08:00
Guang Zhu
90b9841cef Merge "disable HW acceleration" 2010-12-06 11:36:54 -08:00
Xavier Ducrohet
41738e7862 Merge "LayoutLib: Update font object when text info changes in paint delegate" 2010-12-06 11:32:43 -08:00
Guang Zhu
18fcfbd028 Merge "change how assets are copied out of apk" 2010-12-06 11:28:49 -08:00
Daniel Sandler
b9cc5de33e Merge "Hide navigation buttons and clock on lockscreen." 2010-12-06 11:15:45 -08:00
Jean-Baptiste Queru
32f0f53d40 am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US." 
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
  NumberPicker: Set formatter local value to US.
 2010-12-06 11:05:47 -08:00
Jean-Baptiste Queru
9d2e1882cb am 864b1e00: Merge "NumberPicker: Set formatter local value to US." 
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
  NumberPicker: Set formatter local value to US.
 2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
907333ec69 Merge "NumberPicker: Set formatter local value to US." 2010-12-06 10:57:04 -08:00
Irfan Sheriff
3e327fbdf2 am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread 
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
  DO NOT MERGE Avoid nullifying dhcp target
 2010-12-06 10:42:58 -08:00
Xavier Ducrohet
27a3d00657 Merge "LayoutLib: Fix logging." 2010-12-06 10:40:38 -08:00
Andy Stadler
60795d399e Merge "Fix notification/builder defaults" 2010-12-06 10:38:04 -08:00
John Wang
a3b13513ab Merge "Block incoming calls for non-voice-device." 2010-12-06 10:29:49 -08:00
Gilles Debunne
d94276f9ed Merge "Made TextView use the new localState API for drag info" 2010-12-06 10:22:12 -08:00
Kenny Root
fa522704e7 Merge "Add measurement API to DefaultContainerService" 2010-12-06 10:21:47 -08:00
Irfan Sheriff
49820a1267 Merge "Hold network hand-off wakelock only when connected" 2010-12-06 10:17:57 -08:00
Yu Shan Emily Lau
c9f2c1d7e8 Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)" 2010-12-06 10:14:16 -08:00
Fred Quintana
f0ac1cfc86 Merge "add caching to the AccountManagerService" 2010-12-06 09:55:54 -08:00
Robert Greenwalt
55e52e3e04 Merge "Don't clobber the net hostname if it's already set." 2010-12-06 09:54:16 -08:00
Iain Merrick
c4b91d0497 Merge "Call flushCookieStore() from CookieSyncManager." 2010-12-06 05:40:48 -08:00
satok
7ca57ea784 Merge "Fix null pointer exception" 2010-12-05 21:38:30 -08:00
Jeff Hamilton
a01ed4d6ac am c1576ad6: Update the docs to clarify the ordering constraints. 
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
  Update the docs to clarify the ordering constraints.
 2010-12-05 20:03:59 -08:00
Jason Sams
174a6c9dd8 Merge "Prevent message overrun in LocklessCommandFifo." 2010-12-05 19:54:18 -08:00
Nick Pelly
be0ed98e3a am 3d524e56: Merge gingerbread-nfc into gingerbread 
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
  First implementation of MifareUltralight
 2010-12-05 18:13:10 -08:00
Nick Pelly
4995b0cd7e Merge gingerbread-nfc into gingerbread 2010-12-05 18:08:16 -08:00
Adam Powell
fe08222c03 Merge "Add dividers to action bar navigation. Lighter dividers for holo themes." 2010-12-05 16:49:40 -08:00
Nick Pelly
3d3f99de94 am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
 2010-12-05 14:49:00 -08:00