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

22510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
58fc739c75 am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread 
Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920'

* commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
  DO NOT MERGE. Select word no longer selects spaces between words.
 2010-10-05 16:16:20 -07:00
Scott Main
f29cde6dc0 am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement 
Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f'

* commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f':
  docs: update homepage with more countries for market announcement
 2010-10-05 16:15:44 -07:00
Adam Powell
66be548f08 am 5a5fff71: Fix bug 3064143 - remove default bold on buttons 
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp

* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
  Fix bug 3064143 - remove default bold on buttons
 2010-10-05 15:49:23 -07:00
Alex Sakhartchouk
c8a831e113 Merge "Adding average fps counter. Removing rsLight from libRS" 2010-10-05 15:32:38 -07:00
Chet Haase
a0ac582a72 Merge "Adding next/prev to fragment animations and to PreferenceActivity" 2010-10-05 15:21:34 -07:00
Scott Main
951c3c283c Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." 2010-10-05 15:19:27 -07:00
Scott Main
dc7921f533 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-05 15:17:40 -07:00
James Dong
bc16dbc810 am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread 
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'

* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
  Resilent media time stamp adjustment
 2010-10-05 15:17:29 -07:00
Gilles Debunne
1f9f022c07 am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread 
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'

* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
  Removed icon in Alert dialog header.
 2010-10-05 15:17:17 -07:00
Adam Powell
d15e65f683 am dcbf315e: am 368733b2: Remove overscroll_edge.png from drawable/ 
Merge commit 'dcbf315e83234623622bd268a823ecc4dc49e375'

* commit 'dcbf315e83234623622bd268a823ecc4dc49e375':
  Remove overscroll_edge.png from drawable/
 2010-10-05 15:17:05 -07:00
Adam Powell
11d97cc012 am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'

* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
  Fix bug 3052686 - ScrollView padding treated incorrectly
 2010-10-05 15:16:48 -07:00
Romain Guy
6b391886cf Merge "Add support for paletted textures." 2010-10-05 15:00:01 -07:00
Dianne Hackborn
2e19a3c728 am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 
Merge commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp

* commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6':
  Fix issue #3056500: Problem report for ASTRO
 2010-10-05 14:45:32 -07:00
Joe Onorato
494e9e83c2 am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread 
Merge commit 'f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp

* commit 'f7872780ca3dae9584251b1e3495aed12110254c':
  PowerManagerService needs yet another flag...
 2010-10-05 14:45:28 -07:00
Dianne Hackborn
0202e358cf Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 2010-10-05 14:42:04 -07:00
Joe Onorato
ade00a09c4 Merge "PowerManagerService needs yet another flag..." into gingerbread 2010-10-05 14:41:16 -07:00
Andreas Huber
6748aa80bb am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 
Merge commit '17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp

* commit '17bc4f65324a823598e7671256c815bf32ddcc95':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
 2010-10-05 14:13:16 -07:00
Andreas Huber
ec2c1c8d2c Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 2010-10-05 14:09:32 -07:00
Kenny Root
ffeaa5c0a0 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
 2010-10-05 14:07:29 -07:00
Kenny Root
2daafa5af9 Merge "Remove lingering system app native libs in /data" into gingerbread 2010-10-05 14:04:26 -07:00
Romain Guy
5f1077a214 Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Christopher Tate
936b72238f Merge "Make View.DragThumbnailBuilder a static class" 2010-10-05 13:43:44 -07:00
Jason Sams
f45cac1a15 Merge "Implement allocation resizing." 2010-10-05 13:35:47 -07:00
Jeff Brown
da5aa4cd99 am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread 
Merge commit '78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp

* commit '78d15acfb20269ce263ce19514a2c0e7a98409e2':
  Make secure views tolerate IME overlays.
 2010-10-05 13:17:04 -07:00
Alex Sakhartchouk
5213e80eac Merge "Adding text metrics to renderscript." 2010-10-05 13:13:40 -07:00
Kenny Root
cc5b070f17 am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread 
Merge commit '8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp

* commit '8735c4cda00de26127d694bfbc81e192c4caca44':
  Get correct native library path on reinstall
 2010-10-05 13:13:36 -07:00
Dianne Hackborn
54cf1d857a am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread 
Merge commit 'e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp

* commit 'e02e41f484a115b5278dcc07f2d6c90819279800':
  DO NOT MERGE: Get rid of status bar's dim during night.
 2010-10-05 13:13:25 -07:00
Jeff Brown
1a727bd085 Merge "Make secure views tolerate IME overlays." into gingerbread 2010-10-05 13:06:05 -07:00
Mike Lockwood
81833f3059 resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp 
Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059
 2010-10-05 16:00:13 -04:00
Dianne Hackborn
a8d3f7b976 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread 
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
 2010-10-05 12:54:41 -07:00
Kenny Root
0f85f28b21 Merge "Get correct native library path on reinstall" into gingerbread 2010-10-05 12:48:46 -07:00
Dianne Hackborn
d39316d69e Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread 2010-10-05 12:48:40 -07:00
Mike Lockwood
5bf21bce37 Merge changes Ic5551c94,I0207f7f7 into gingerbread 
* changes:
  GPS: Clean up GPS API extension initialization in JNI code.
  GPS: Add support for AGpsRilInterface.
 2010-10-05 12:36:34 -07:00
Vasu Nori
c480e1c793 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Jeff Brown
35cf0e9854 Make secure views tolerate IME overlays. 
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
 2010-10-05 12:26:23 -07:00
Gilles Debunne
4103016bfe Merge "resolved conflicts for merge of 8390651c to master" 2010-10-05 12:26:22 -07:00
Robert Greenwalt
ef03f5a047 am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread 
Merge commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp

* commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
  Add supporting MCC=450(Korea)
 2010-10-05 12:24:47 -07:00
Gilles Debunne
bcaeac176f resolved conflicts for merge of 8390651c to master 
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
 2010-10-05 12:11:56 -07:00
Robert Greenwalt
3a6f070d32 Merge "Add supporting MCC=450(Korea)" into gingerbread 2010-10-05 11:46:12 -07:00
Ficus Kirkpatrick
536c9e26af Merge "Reduce log spam." 2010-10-05 11:33:03 -07:00
Brett Chabot
3f58b735ac am b9a40068: Merge "Failing test cleanup." into gingerbread 
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
 2010-10-05 11:05:37 -07:00
Brett Chabot
5e848fd6e8 Merge "Failing test cleanup." into gingerbread 2010-10-05 11:00:07 -07:00
Joe Onorato
f8649200d4 manual merge Merge commit '77e42376' into work 
Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
 2010-10-05 12:37:03 -04:00
Adam Powell
6e01d342c9 am abcbb1a1: Fix bug 3061544 and some clipping errors. 
Merge commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp

* commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66':
  Fix bug 3061544 and some clipping errors.
 2010-10-04 23:16:00 -07:00
Hung-ying Tyan
2fb7b10595 am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 
Merge commit '718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp

* commit '718e0033e69fa7d1db12242324ab9098ac430bf5':
  SIP: add SERVER_UNREACHABLE error code.
 2010-10-04 23:07:43 -07:00
Hung-ying Tyan
94e8d04615 am 1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread 
Merge commit '1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp

* commit '1862af57b2c5ca5387b12974e8ef661651edb97d':
  SipService: supply PendingIntent when open a profile.
 2010-10-04 23:07:39 -07:00
Dianne Hackborn
445a624a24 am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 
Merge commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp

* commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
  Make it easier to figure out whether an app can go on sd card.
 2010-10-04 23:04:53 -07:00
Hung-ying Tyan
e1fd7ab671 Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread 2010-10-04 23:03:26 -07:00
Hung-ying Tyan
8ab7523752 Merge "SipService: supply PendingIntent when open a profile." into gingerbread 2010-10-04 23:02:55 -07:00
Dianne Hackborn
de5ce1388d Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 2010-10-04 23:00:25 -07:00