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

14265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
3e56175a45 am a69e10db: fix doc bug in hello gallery tutorial 
Merge commit 'a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp

* commit 'a69e10db2fb58deb5e27aa67c46d267af928374b':
  fix doc bug in hello gallery tutorial
 2010-05-05 09:27:50 -07:00
Dianne Hackborn
ec2d0323cf am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
 2010-05-04 18:22:39 -07:00
Bjorn Bringert
930ee51fae am c9dc1090: Merge "Build searchables list after boot" into froyo 
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
 2010-05-04 18:22:36 -07:00
Dianne Hackborn
25932b1088 Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Bjorn Bringert
f442576ecf Merge "Build searchables list after boot" into froyo 2010-05-04 16:57:56 -07:00
Scott Main
c224e59822 am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo 
Merge commit '5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp

* commit '5e5202bd6f9e7687fc6399762529b0ef5625e515':
  docs: resolve doc bug
 2010-05-04 16:04:46 -07:00
Scott Main
d11ab7456a Merge "docs: resolve doc bug bug:2648699" into froyo 2010-05-04 16:03:37 -07:00
Adam Powell
2b349fac4d am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke() 
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp

* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
  Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
 2010-05-04 15:40:36 -07:00
Andreas Huber
e7f1b6dd9c am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp

* commit 'e083d0a2f50906423ab548047d436c74648fc488':
  Support for Ogg Vorbis decoding in stagefright.
 2010-05-04 14:29:04 -07:00
Andreas Huber
fe8bcd9c8a Merge "Support for Ogg Vorbis decoding in stagefright." into froyo 2010-05-04 14:27:26 -07:00
Scott Main
46016a24eb am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:21:21 -07:00
Scott Main
69c8c1c8db Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -07:00
Daniel Sandler
f27cbc7bed am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
 2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2 Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Dan Morrill
34910b3d28 am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:38:03 -07:00
Joe Onorato
906a59288c am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:37:59 -07:00
Dan Morrill
515eb68646 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -07:00
The Android Open Source Project
00ad0d2d5c merge from open-source master 
Change-Id: I5f552b45caae639170674213c23f154437b58afd
 2010-05-04 09:20:16 -07:00
Romain Guy
a4b249c12f Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
0fb44af855 merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -07:00
Daniel Sandler
ea4638de04 am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp

* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
  Tweak style of recent apps dialog title.
 2010-04-30 11:30:29 -07:00
Daniel Sandler
70f124064f Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 10:55:03 -07:00
Scott Main
91916b0291 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:23:10 -07:00
Scott Main
878f4e537c Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -07:00
Marc Blank
83a1c18b92 am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo 
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
 2010-04-29 15:40:30 -07:00
Marc Blank
c8ba40f759 Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 15:39:37 -07:00
Kenny Root
55c91f4369 am 77a1beb1: Merge "Import revised translations" into froyo 
Merge commit '77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp

* commit '77a1beb137948ad45423bb8fcd7e424e36144133':
  Import revised translations
 2010-04-29 15:29:22 -07:00
Kenny Root
f45bffd15c Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Scott Main
eb912814d5 am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 
Merge commit '764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp

* commit '764caf2481d935ce6870ec141f1e845178df8b47':
  docs: rewrite information about using shared preferences, internal and
 2010-04-29 15:23:32 -07:00
Scott Main
94921632d8 Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:21:34 -07:00
Dianne Hackborn
08e115f8b8 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update 
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
 2010-04-29 12:20:42 -07:00
Jean-Baptiste Queru
17aab035dd Merge "Fix an NPE in InputMethodService when mExtractAction is null." 2010-04-29 10:03:40 -07:00
Adam Powell
9ee392bf96 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
 2010-04-28 19:34:49 -07:00
Steve Howard
76d91325dc am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp

* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
  Fix a minor bug in transitions to left-edge-up landscape.
 2010-04-28 16:03:28 -07:00
Steve Howard
16e1998488 Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 15:59:39 -07:00
The Android Open Source Project
658e62322d merge from open-source master 
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
 2010-04-28 15:50:56 -07:00
Vasu Nori
bd05a99fc7 am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp

* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
 2010-04-28 15:38:44 -07:00
Vasu Nori
4196629d75 Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo 2010-04-28 15:35:57 -07:00
Amith Yamasani
08464b5b36 am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp

* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
 2010-04-28 15:21:37 -07:00
Amith Yamasani
2bbb1cce02 Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 2010-04-28 15:18:15 -07:00
Fred Quintana
e47930cd65 am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:13:55 -07:00
Fred Quintana
23894ce086 Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:10:05 -07:00
Dianne Hackborn
240d6d2042 am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 
Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp

* commit 'bc5a03286a72dc3627cee313d473178f5a123049':
  Fix issue #2569139: Sapphire user cannot login to last.fm...
 2010-04-28 13:14:43 -07:00
Dianne Hackborn
6f34aa18b7 Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 2010-04-28 12:42:00 -07:00
Kenny Root
8345be2b2d am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp

* commit '4bba2149f3f2709b24dc40118461c5d683ed6965':
  Import revised translations
 2010-04-28 09:32:55 -07:00
Scott Main
4e6c55e259 am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp 
Merge commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp

* commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
  docs: update information about developing on a device.
 2010-04-28 09:31:28 -07:00
Kenny Root
10159e9986 Merge "Import revised translations" into froyo 2010-04-28 08:05:03 -07:00
Scott Main
1ffd118cab Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo 2010-04-27 18:35:53 -07:00
Vasu Nori
dff737bf08 am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp

* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
  remove myname accidentally included in one of the files
 2010-04-27 16:49:29 -07:00
Vasu Nori
321e49b260 Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 16:44:58 -07:00