ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
29,934 Commits 2 Branches 0 Tags 54 MiB
71376e1d73
Commit Graph

29934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
71376e1d73 am 9732d9e6: am 43703325: Merge "New default wallpaper" into honeycomb 
* commit '9732d9e6ea78b9418cdef0054252d71292812f23':
  New default wallpaper
 2011-02-07 13:41:42 -08:00
Mike Cleron
b59eccf2b3 am 9cfa9c7a: am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb 
* commit '9cfa9c7a3f5f23dec6ef4575407c1076d1b3c479':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
 2011-02-07 13:41:21 -08:00
Daniel Sandler
3952737a2f Merge "resolved conflicts for merge of 31796297 to master" 2011-02-07 13:14:52 -08:00
Daniel Sandler
94bf8d25f5 resolved conflicts for merge of 31796297 to master 
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
 2011-02-07 16:12:16 -05:00
Andreas Huber
7d0610b857 Merge "Display a single (still-)frame of video after seeking while paused." 2011-02-07 13:10:01 -08:00
Alon Albert
f1e8976caa Merge "Move handing of a "cancel" inside try-finally block" 2011-02-07 12:20:36 -08:00
Mike Lockwood
7cf4665e09 Merge "MTP: Add support for querying all objects in GetObjectPropList" 2011-02-07 12:14:13 -08:00
Dianne Hackborn
5e792efa20 Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)" 2011-02-07 12:11:12 -08:00
Scott Main
1dd49d5af4 am b1ef1c80: am b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs: 
* commit 'b1ef1c80210deec80e0055fc33c8188561732895':
  cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
 2011-02-07 11:41:07 -08:00
Eric Laurent
e31b12ef41 am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
  Issue 3371080: fix VolumePanel in mute state
 2011-02-07 11:40:51 -08:00
Jim Miller
2d418dd305 am 6b590c8f: am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb 
* commit '6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.
 2011-02-07 11:40:38 -08:00
Jim Miller
ec19a89abf am da983f73: am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb 
* commit 'da983f734c608fde57ea4f213d8640490a2f3a84':
  Issue 3371080: fix volume update in mute state.
 2011-02-07 11:40:21 -08:00
Scott Main
83f7c7647a am be779cb7: am 4fe3e53e: update menu dev guide with more info about action bar 
* commit 'be779cb745758bd22429f5e1ac2f5a99d5eb1b62':
  update menu dev guide with more info about action bar
 2011-02-07 11:40:04 -08:00
Dianne Hackborn
bc6a2297a1 am 94baff47: am 1b1962f3: Merge "Fix issue #3420898: More wallpaper issues" into honeycomb 
* commit '94baff47975fb3ae1380333f23fc2de2dc65eb86':
  Fix issue #3420898: More wallpaper issues
 2011-02-07 11:39:45 -08:00
Gil Dobjanschi
11911170cb am 99ec3e7f: am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb 
* commit '99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
  Bug fix: 3421011 ANR during delete video clip
 2011-02-07 11:39:27 -08:00
Chet Haase
a3a94e797b am 38e8c353: am 59301777: Merge "Fix leak in reused display lists" into honeycomb 
* commit '38e8c35322e41708e5b1f2260d7d67ff525d8560':
  Fix leak in reused display lists
 2011-02-07 11:38:47 -08:00
Rebecca Schultz Zavin
5e9f481984 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-07 11:38:34 -08:00
Adam Powell
d155e16f04 am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb 
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
  Asset updates for dialog frames and seek bar thumbs
 2011-02-07 11:38:25 -08:00
Justin Ho
bc98f03c56 am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb 
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
  Updating default wallpaper
 2011-02-07 11:38:04 -08:00
Justin Ho
1ffb8928d1 am a9b9f9c8: am b3e00457: Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb 
* commit 'a9b9f9c816b2dac559cd06a756587f92e6f2215c':
  Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons
 2011-02-07 11:37:48 -08:00
Nick Pelly
067b713c3f am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread 
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
  Fix docs type that broke build.
 2011-02-07 11:37:28 -08:00
Romain Guy
fdf293593c am a9c369d0: am 87465f02: Merge "Fixes cache misses and extra allocations. Bug #3421454" into honeycomb 
* commit 'a9c369d0fbe2b995f456877b2368aac95f810558':
  Fixes cache misses and extra allocations. Bug #3421454
 2011-02-07 11:37:12 -08:00
Jean-Baptiste Queru
c5bddf5caa am c3a9bfde: am 501dbaea: am 6dbdcd55: am db71bda6: Merge from gingerbread 
* commit 'c3a9bfde60dd4585358a1cf98d302b1a36f39281':
 2011-02-07 11:36:55 -08:00
Amith Yamasani
a9d45654fb am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb 
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
  Expanded volume panel with sliders and mute buttons.
 2011-02-07 11:36:32 -08:00
Scott Main
0a1fc55ab0 am 6a7ca8f8: am 51768f4b: am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread 
* commit '6a7ca8f807c842fe5f4ed14df25f4f919b6ab116':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
 2011-02-07 11:36:04 -08:00
Nick Pelly
375f0f8fd4 am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread 
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
  NFC documentation overhaul.
 2011-02-07 11:35:47 -08:00
Mathias Agopian
1d3298cab3 am e5b6c284: am 33e9cb47: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into honeycomb 
* commit 'e5b6c284b6070a3ca9ac1d33b56baba95775ced5':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
 2011-02-07 11:35:20 -08:00
Justin Ho
98ba0ab94b am 0c3169cf: am 60a008ed: Updated volume dialog assets 
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
  Updated volume dialog assets
 2011-02-07 10:57:19 -08:00
Jean-Baptiste Queru
e9491f7ec0 am b6bf10e4: Merge 917d9ea1 
* commit 'b6bf10e4bd2c17838a00091c3b8efb2f91ce3457':
  Fix the Multi-page SMS sending error to several receipents
 2011-02-07 10:48:25 -08:00
Justin Ho
d85314bf27 am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb 
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
  Updated default wallpaper
 2011-02-07 10:48:07 -08:00
Justin Ho
e7a1d35500 am bf13e077: am e8d2b985: Merge "Scrubbing OGGs and updating all WAVs" into honeycomb 
* commit 'bf13e0774e67f03433f5088a7d2c2fe6ee25e0c8':
  Scrubbing OGGs and updating all WAVs
 2011-02-07 10:47:39 -08:00
Justin Ho
2040242b5b am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb 
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
  Adding remaining volume dialog assets
 2011-02-07 10:47:17 -08:00
Justin Ho
4399db14d5 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-07 10:47:01 -08:00
Justin Ho
7c192d5021 am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749 
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
  Updated Talk notification icon Bug: 3362749
 2011-02-07 10:46:47 -08:00
Andy Stadler
f6fe68fb15 Merge "Fix warnings" 2011-02-07 10:46:26 -08:00
David 'Digit' Turner
af916e1b14 Merge "WindowManagerService: Disable screen rotation animation under emulation." 2011-02-06 12:53:09 -08:00
Lorenzo Colitti
78b945f9bc Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -08:00
Wink Saville
76984f8dbf Merge "Fix SETUP_DATA_CALL handling." 2011-02-04 15:04:38 -08:00
Glenn Kasten
f07556fb02 Merge "Bug 3366668 Use BinderService template" 2011-02-04 14:00:17 -08:00
Andreas Huber
e4bc50507c Merge "Ignore format change message in sf2 instead of asserting" 2011-02-04 10:21:15 -08:00
Andreas Huber
7938367dd5 Merge "Improvements/fixes to ACodec." 2011-02-04 10:21:07 -08:00
Robert Greenwalt
29c9e9de0e Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers." 2011-02-04 10:16:22 -08:00
Romain Guy
89ecfee3b0 am 43703325: Merge "New default wallpaper" into honeycomb 
* commit '43703325d8a8b755b9891708006abe8700884538':
  New default wallpaper
 2011-02-03 23:08:26 -08:00
Romain Guy
e896fc2f2b Merge "New default wallpaper" into honeycomb 2011-02-03 23:04:50 -08:00
Mike Cleron
77856fa6dc am f6141980: Merge changes I46acd27a,I70b322e1 into honeycomb 
* commit 'f6141980c84f64618f083297bc37cfae7e0fca84':
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
 2011-02-03 21:19:33 -08:00
Mike Cleron
f920bb1ca4 Merge changes I46acd27a,I70b322e1 into honeycomb 
* changes:
  aa is better than cc
  Prevent ProgressBar from slowing down everything. bug #3422568
 2011-02-03 21:17:09 -08:00
Daniel Sandler
1214db995d am 4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb 
* commit '4ad2547fe08bab430d7d9f9cc4b789410856c9c3':
  Ongoing notification for GPS use.
 2011-02-03 20:51:00 -08:00
Daniel Sandler
f11b1ccde3 Merge "Ongoing notification for GPS use." into honeycomb 2011-02-03 20:49:10 -08:00
Scott Main
4a2dc03121 am b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs: 
* commit 'b65b2df6e421d0fc8516e933f52763ff172760f3':
  cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
 2011-02-03 19:40:40 -08:00
Eric Laurent
d4d507ead2 am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb 
* commit 'e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
  Issue 3371080: fix VolumePanel in mute state
 2011-02-03 19:38:27 -08:00