ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
21,418 Commits 2 Branches 0 Tags 54 MiB
6bea174983
Commit Graph

21418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
e64d27c043 am aac4630c: am a4270e7e: am 73e150c8: provide link to backup guide above the fold 
Merge commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957'

* commit 'aac4630cc5b3076e3cd6f65c52c8ff5f8f921957':
  provide link to backup guide above the fold
 2010-09-20 19:33:15 -07:00
Dianne Hackborn
0778a9713d am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread 
Merge commit '4b187e804fdfdbc825e17646e82e0218e316a339'

* commit '4b187e804fdfdbc825e17646e82e0218e316a339':
  Some battery improvements:
 2010-09-20 19:33:06 -07:00
Mindy Pereira
8057d70510 am ee632159: am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'ee63215903db7ddd32f165f0a5a771700041f1ed'

* commit 'ee63215903db7ddd32f165f0a5a771700041f1ed':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 19:32:32 -07:00
Steve Howard
784dca5ce6 am 4735be02: am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread 
Merge commit '4735be0211a996f791accc77aeb399df2258ab4c'

* commit '4735be0211a996f791accc77aeb399df2258ab4c':
  New error status for "destination file already exists".
 2010-09-20 19:32:19 -07:00
John Wang
2603eb319b am 48ab3991: am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread 
Merge commit '48ab3991647040d540d295a40247367f6707f4c2'

* commit '48ab3991647040d540d295a40247367f6707f4c2':
  Use PhoneBase in the phone list.
 2010-09-20 19:32:11 -07:00
Brian Swetland
04b9ff8e26 am 5c746522: am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7'

* commit '5c7465220d52c64c87fe4566fe109c649ec5c4f7':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 19:32:01 -07:00
Romain Guy
4f612e9f25 Merge "Add support for SweepGradient in the GL renderer." 2010-09-20 17:55:58 -07:00
Mike Lockwood
4313b5a780 am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 
Merge commit '307aef01257cbba42f095f7020a4a3b753f3807b' into gingerbread-plus-aosp

* commit '307aef01257cbba42f095f7020a4a3b753f3807b':
  LocationManager: Hide location provider and geocode provider APIs.
 2010-09-20 17:19:04 -07:00
Mike Lockwood
abbf805c91 Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread 2010-09-20 17:16:03 -07:00
Dianne Hackborn
44bfeb931d am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 
Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
 2010-09-20 17:06:12 -07:00
Dianne Hackborn
2f516cddac Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread 2010-09-20 17:03:15 -07:00
Dianne Hackborn
295b9e65f0 am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread 
Merge commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3' into gingerbread-plus-aosp

* commit '4db643eb8430d063b1adc4ba164bfa1c1281bdf3':
  In theory the package manager now scans /vendor/app
 2010-09-20 16:57:05 -07:00
Dianne Hackborn
6473500135 Merge "In theory the package manager now scans /vendor/app" into gingerbread 2010-09-20 16:54:22 -07:00
Mike Lockwood
ac66282941 Merge "CameraBrowser: show format in object info and show info for non-JPEG objects" 2010-09-20 16:52:51 -07:00
Mike Lockwood
13923a2fd4 Merge "MTP: Fix typo that resulted in the MTP provider returning thumb format for object format" 2010-09-20 16:52:06 -07:00
Scott Main
259c28f6f0 am a4270e7e: am 73e150c8: provide link to backup guide above the fold 
Merge commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa' into gingerbread-plus-aosp

* commit 'a4270e7e1e09bf5f60c65102d34e887033c5befa':
  provide link to backup guide above the fold
 2010-09-20 16:40:46 -07:00
Scott Main
37f2d1a005 am 73e150c8: provide link to backup guide above the fold 
Merge commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed' into gingerbread

* commit '73e150c886afc6cd92e8b065a58d61e0b2a098ed':
  provide link to backup guide above the fold
 2010-09-20 16:37:32 -07:00
Dianne Hackborn
dd7b6bb3f9 am 8e1b84e7: Merge "Some battery improvements:" into gingerbread 
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
 2010-09-20 16:34:45 -07:00
Dianne Hackborn
95ca338d1a Merge "Some battery improvements:" into gingerbread 2010-09-20 16:29:42 -07:00
Mindy Pereira
fb744481e5 am d3301e9f: Add mdpi images for overscroll EdgeGlow. 
Merge commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c' into gingerbread-plus-aosp

* commit 'd3301e9f6b1e5e3d92e3bfff62e174d8ad27c99c':
  Add mdpi images for overscroll EdgeGlow.
 2010-09-20 15:49:51 -07:00
Steve Howard
4f2f7f6421 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread 
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
 2010-09-20 15:43:43 -07:00
Steve Howard
642b2d271d Merge "New error status for "destination file already exists"." into gingerbread 2010-09-20 15:40:41 -07:00
John Wang
bf7dd2c98f am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread 
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
 2010-09-20 15:38:40 -07:00
John Wang
6a9165006d Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Brian Swetland
d77cec91b0 am 181e5ea8: Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 
Merge commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760' into gingerbread-plus-aosp

* commit '181e5ea8087360742b3ed0a7f2e6f8f8baa0a760':
  support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl
 2010-09-20 14:08:46 -07:00
Brian Swetland
ef7b152fad Merge "support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl" into gingerbread 2010-09-20 14:05:25 -07:00
Joe Onorato
91f13923ee Merge "Put the more notifications button on the left where it belongs." 2010-09-20 13:37:25 -07:00
Joe Onorato
605990b0a8 Merge "Tapping outside the status bar panels closes them." 2010-09-20 13:25:07 -07:00
Brian Swetland
2b9e4f6a24 support loading EGL libraries from /vendor/lib/egl as well as /system/lib/egl 
Change-Id: Idd9ca85ce3ba6c92234375071b53e5365e689062
 2010-09-20 12:58:15 -07:00
Amith Yamasani
58cc97dab3 Merge "Fix attribute parsing of PreferenceHeader_id" 2010-09-20 11:26:02 -07:00
Joe Onorato
f4af62f675 Merge "Tablet ticker." 2010-09-20 11:18:48 -07:00
Dmitri Plotnikov
c692e2e1c9 Merge "Format the phone number with the number country's convention." 2010-09-20 10:43:34 -07:00
Kristian Monsen
5c52c02b3e Merge "HTTP auth for Chromium HTTP stack (Java side)" 2010-09-20 05:52:53 -07:00
Hung-ying Tyan
fc09e8095b am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback 
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'

* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
  SipPhone: fix missing-call DisconnectCause feedback
 2010-09-20 00:58:08 -07:00
Hung-ying Tyan
63c117f5be am 8544560c: SipPhone: fix missing-call DisconnectCause feedback 
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
 2010-09-20 00:51:07 -07:00
Hung-ying Tyan
4fa4af9da8 am 97bc368b: am b17eae9e: SipService: move event handling out of system server\'s main thread 
Merge commit '97bc368bc445c0015de6dd6557feff0dd5527d9d'

* commit '97bc368bc445c0015de6dd6557feff0dd5527d9d':
  SipService: move event handling out of system server's main thread
 2010-09-19 19:17:18 -07:00
Hung-ying Tyan
64ec5c1f2a am b17eae9e: SipService: move event handling out of system server\'s main thread 
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
 2010-09-19 19:14:30 -07:00
Hung-ying Tyan
48191ffc34 am 37d1b249: am 97963794: SIP: convert enum to static final int. 
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
  SIP: convert enum to static final int.
 2010-09-19 18:59:43 -07:00
Hung-ying Tyan
f5b3d27bd7 am 97963794: SIP: convert enum to static final int. 
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
 2010-09-19 18:56:27 -07:00
Hung-ying Tyan
2ee0d03919 resolved conflicts for merge of cf1620d6 to master 
Change-Id: I7a1436ec4c6a96801c096f61e9dc3571c1927cae
 2010-09-20 09:31:12 +08:00
Hung-ying Tyan
2ddd3e119d am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread 
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
 2010-09-19 18:11:44 -07:00
Hung-ying Tyan
ad50813521 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Mike Lockwood
5505ce1601 am b5994789: (-s ours) am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events 
Merge commit 'b5994789af9c676f8e067a4a8706d2177b7cc142'

* commit 'b5994789af9c676f8e067a4a8706d2177b7cc142':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
 2010-09-19 11:15:08 -07:00
Mike Lockwood
376cdd6d59 am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events 
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
 2010-09-19 11:10:57 -07:00
Adam Powell
bcf581a8d6 am 99f0f367: am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 
Merge commit '99f0f3676f50640dbb22bd12960f771fc414862e'

* commit '99f0f3676f50640dbb22bd12960f771fc414862e':
  Fix some drawing artifacts/bugs around overlays/text anchors
 2010-09-18 00:16:35 -07:00
Jeff Brown
62927a5539 am a8d95248: am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread 
Merge commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7'

* commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7':
  Reduce lock thrashing in native Looper.
 2010-09-18 00:16:29 -07:00
Adam Powell
2c45985c23 am 4a4a53ae: am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread 
Merge commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4'

* commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4':
  Fix silly touch bug in TextView. Oops.
 2010-09-17 23:26:05 -07:00
Marco Nelissen
c15bdbfbde am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'

* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
  Add a check to track a problem the monkey script has been triggering.
 2010-09-17 23:25:37 -07:00
Dianne Hackborn
7f58011bf3 resolved conflicts for merge of 1f377298 to master 
Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
 2010-09-17 23:12:26 -07:00
Adam Powell
cc89e1208f am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
 2010-09-17 19:30:03 -07:00