ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
39,677 Commits 2 Branches 0 Tags 54 MiB
187ec6ef78
Commit Graph

39677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
8c4cbf0792 Merge "Update unlock halo asset" into ics-mr0 2011-10-14 14:23:41 -07:00
Justin Ho
dd6668582f Merge "Update lockscreen assets" into ics-mr0 2011-10-14 14:17:26 -07:00
Justin Ho
ff2618d6a9 Merge "Update bullet permission asset" into ics-mr0 2011-10-14 14:12:02 -07:00
Stephen Hines
5dff2beb5d Merge "Make launchtestxlw use constant." 2011-10-14 14:02:43 -07:00
Justin Ho
a550b205b8 am e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0 
* commit 'e95aaf06fba2766521aac24ee252db289ce2e1ef':
  Update indicator_code lock assets
 2011-10-14 14:00:38 -07:00
Justin Ho
e46d0c73ca Merge "Update indicator_code lock assets" into ics-mr0 2011-10-14 13:58:52 -07:00
Justin Ho
60655e2cdb am 8b319150: Merge "Update text select handles" into ics-mr0 
* commit '8b3191506bf646b9a0568b8e523eb794796b2c20':
  Update text select handles
 2011-10-14 13:58:15 -07:00
Justin Ho
2f9a3ccdd4 am 048e5c80: Merge "Update spinners" into ics-mr0 
* commit '048e5c804ed07249ba59372df384c0977ca9b8df':
  Update spinners
 2011-10-14 13:58:13 -07:00
Justin Ho
10dfa28b0f am 4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0 
* commit '4a6f76da2326c351c6094050761571d229da178d':
  Updated scrubber_control assets
 2011-10-14 13:55:57 -07:00
Justin Ho
5841d9c9f3 am 64ba25de: Merge "Update fastscroll" into ics-mr0 
* commit '64ba25de51d0b0b35012acc2a30014e8cb0ede53':
  Update fastscroll
 2011-10-14 13:55:56 -07:00
Justin Ho
6dc7f2f06a am 3cc6f5b4: Merge "Update checkboxes" into ics-mr0 
* commit '3cc6f5b447ae8af9b09568fd0c686a5533e229f9':
  Update checkboxes
 2011-10-14 13:55:54 -07:00
Justin Ho
72dba186c1 Merge "Update text select handles" into ics-mr0 2011-10-14 13:55:08 -07:00
Justin Ho
fe5f2d13e0 Merge "Update spinners" into ics-mr0 2011-10-14 13:54:58 -07:00
Justin Ho
5fc5ba6be5 am 3b89e3a5: Merge "Updating rating stars" into ics-mr0 
* commit '3b89e3a51f9d8e763f669dd1be88104ba7c8e9a0':
  Updating rating stars
 2011-10-14 13:53:25 -07:00
Justin Ho
6799646d84 Merge "Updated scrubber_control assets" into ics-mr0 2011-10-14 13:53:08 -07:00
Justin Ho
4b64034f38 Merge "Update fastscroll" into ics-mr0 2011-10-14 13:52:57 -07:00
Justin Ho
a61a919ddc Merge "Update checkboxes" into ics-mr0 2011-10-14 13:52:45 -07:00
Justin Ho
cf86fde872 Merge "Updating rating stars" into ics-mr0 2011-10-14 13:51:25 -07:00
Jack Palevich
59b51c1765 Merge "Work around race condition when shutting down a surface flinger surface." 2011-10-14 13:35:10 -07:00
Martijn Coenen
9f9418f22f am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
  Remove NfcFragment from activity when no longer sharing.
 2011-10-14 13:00:45 -07:00
Eric Laurent
c588b1616a am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0 
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
  Indicate screen off condition to audio framework.
 2011-10-14 12:58:40 -07:00
Jamie Gennis
68fb7bd93b am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0 
* commit 'a1e273ae590ee08cf27baca7facfce51e598d995':
  Surface: fix a protected buffer test
 2011-10-14 12:58:37 -07:00
Martijn Coenen
d2d96c5016 Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 2011-10-14 12:57:34 -07:00
Eric Laurent
2de68676e0 Merge "Indicate screen off condition to audio framework." into ics-mr0 2011-10-14 12:56:52 -07:00
Jamie Gennis
44f14437c0 Merge "Surface: fix a protected buffer test" into ics-mr0 2011-10-14 12:56:28 -07:00
Daniel Sandler
da63300a4a am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0 
* commit '7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4':
  Adjust text sizes for better behavior under user scaling.
 2011-10-14 12:24:40 -07:00
Daniel Sandler
ea2ac4b9ba Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0 2011-10-14 12:22:07 -07:00
Scott Main
4046fa183a am c02c33e5: Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0 
* commit 'c02c33e5bb13cc2a740d01ba979cce20adcd8128':
  docs: misc changes to overview and add known issues link to sdk tools notes
 2011-10-14 12:15:05 -07:00
Scott Main
695e1f8f9e Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0 2011-10-14 12:12:53 -07:00
satok
78ffd67503 am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0 
* commit 'e6fee18d16a86c266afef48f7705268435a99111':
  Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
 2011-10-14 11:16:57 -07:00
satok
7b9052140f Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed." into ics-mr0 2011-10-14 11:15:05 -07:00
Jim Miller
0036552ac9 am 83e160d3: Fix build. 
* commit '83e160d3b3ad839b0c2faf40f4477a2468098995':
  Fix build.
 2011-10-14 11:12:41 -07:00
Gilles Debunne
91d274d443 Merge "Bug 5420741: exception when rotating device while suggestion popup is visible" 2011-10-14 11:09:59 -07:00
Gilles Debunne
287ffb9309 Merge "Spell checher's language synced with keyboard." 2011-10-14 11:09:44 -07:00
Joe Fernandez
f1119de3aa am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 
* commit '471fa9d10b4fa4da070c0ffb5fa5ea1354c8e6b8':
  docs: add developer guide cross-references, Project ACRE, Round 2
 2011-10-14 10:54:29 -07:00
Joe Fernandez
d0f13aba75 Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 2011-10-14 10:52:33 -07:00
The Android Open Source Project
d9bd52b881 Reconcile with ics-mr0-release 
Change-Id: I53af9dda1856406a193e3def554e576553d9e868
 2011-10-14 10:52:17 -07:00
Christopher Tate
5b5c7f9917 am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 
* commit '8f4e49a8fe4f568b2be090768f3297655ecd6d34':
  DO NOT MERGE - Require device encryption password for adb backup/restore
 2011-10-14 10:35:40 -07:00
Amith Yamasani
278c39b65d am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 
* commit '000053859290d322625dfcbdb0467fc34d5e55f4':
  Use ringer assets for notification volume since the two volumes are tied.
 2011-10-14 10:33:29 -07:00
Christopher Tate
ce0b8661b7 Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 2011-10-14 10:33:13 -07:00
Scott Main
655055b4af am 33210ec1: Merge "change android beam sample name" into ics-mr0 
* commit '33210ec1f5c8364c4865c718f4d0de00e28b5774':
  change android beam sample name
 2011-10-14 10:31:24 -07:00
Amith Yamasani
f76d41aef1 Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 2011-10-14 10:30:43 -07:00
Scott Main
42b971076f Merge "change android beam sample name" into ics-mr0 2011-10-14 10:29:53 -07:00
Jim Miller
46f824a009 am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 
* commit '1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f':
  Fix 5358124: Better transport control visibility management in lock screen
 2011-10-14 10:20:48 -07:00
Jim Miller
902c9faff5 Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 2011-10-14 10:19:13 -07:00
Daniel Sandler
6194bf16b3 am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ics-mr0 
* commit 'ed37b1bf73ae274da6e50194c824a669fcecb5c0':
  Shrink the ticker's icon to match the status bar.
 2011-10-14 10:18:33 -07:00
Peter Ng
0eece266f8 am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0 
* commit '43642ab9322b90613c496785ae459b64bf9aea4a':
  Stat icons for phone are now the right size
 2011-10-14 10:16:30 -07:00
Daniel Sandler
367732c007 Merge "Shrink the ticker's icon to match the status bar." into ics-mr0 2011-10-14 10:16:14 -07:00
Peter Ng
e73d4eca7b Merge "Stat icons for phone are now the right size" into ics-mr0 2011-10-14 10:15:08 -07:00
John Reck
3ed5fcdac2 am d82cc1de: Merge "Fixup JNI" into ics-mr0 
* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI
 2011-10-14 10:12:14 -07:00