ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
41,211 Commits 2 Branches 0 Tags 54 MiB
507c562517
Commit Graph

41211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
507c562517 am 93dc642e: docs: fix misc bugs from external tracker 
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
  docs: fix misc bugs from external tracker
 2012-03-05 10:06:04 -08:00
The Android Open Source Project
2df5656cfb Reconcile with ics-mr1-release 
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
 2012-03-02 16:43:42 -08:00
Scott Main
ab5c23bedc am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing 
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
  docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
 2012-03-02 16:40:21 -08:00
The Android Automerger
94083a1398 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00
Robert Ly
b88b34907b am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'e5e11fd666d242b099466017c6d9bd23e6d2896d':
  docs: fixing bug 5942573
 2012-03-02 09:06:44 -08:00
Robert Ly
81c173f348 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
Dianne Hackborn
4afecd7a91 am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:21 -08:00
Dianne Hackborn
b534fb5266 Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
Tsu Chiang Chuang
0f88bfc2d8 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:43 -08:00
Tsu Chiang Chuang
b1b58c7e01 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Robert Ly
b11d85180c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:11:05 -08:00
Robert Ly
55383fdaa7 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
84b448849b am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:35 -08:00
Robert Ly
671c6de30c Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
The Android Open Source Project
8f1a37dd23 Reconcile with ics-mr1-release 
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
 2012-03-01 10:40:13 -08:00
Yu Shan Emily Lau
f5d9e573b7 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'eb4f3256b77fe7fd783297a550a64ea441c41169':
  Set the video encoding bit rate for the media recorder stress test.
 2012-02-29 19:00:00 -08:00
Eric Fischer
2d31bdb4b8 am fb393f8b: Mark configuration strings as not translatable. 
* commit 'fb393f8bd79602c933dc829bd36070dd78be2872':
  Mark configuration strings as not translatable.
 2012-02-29 13:26:08 -08:00
Roman Nurik
9ab9e59b85 am a53b3bfa: docs: Android Design downloads section, linkable H2s. 
* commit 'a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
  docs: Android Design downloads section, linkable H2s.
 2012-02-29 12:43:29 -08:00
Robert Ly
b8dea50c14 am f4994b3e: Merge "fix bug 5911175" into ics-mr1 
* commit 'f4994b3eb03e1e772d7d46e8b6dcfc88593db792':
  fix bug 5911175
 2012-02-28 15:39:55 -08:00
Robert Ly
b39e385b97 Merge "fix bug 5911175" into ics-mr1 2012-02-28 15:37:21 -08:00
The Android Automerger
bd026f32e1 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:14:55 -08:00
Dianne Hackborn
a196c9116e am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
 2012-02-28 15:03:28 -08:00
Dianne Hackborn
0003f917f0 Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
258bab7ce6 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc) 
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
 2012-02-28 14:05:23 -08:00
Jason Noguchi
51e749a0fd am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
 2012-02-28 11:49:30 -08:00
Jason Noguchi
e81927cf9a Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
Svetoslav Ganov
3191d487f7 am a2b41b43: NumberPicker showing IME when its input field gains focus. 
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
 2012-02-28 10:35:18 -08:00
The Android Automerger
2b37af478f merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 16:10:06 -08:00
The Android Automerger
6399e0a1e8 merge in ics-mr1-release history after reset to ics-mr1 2012-02-27 14:42:58 -08:00
Robert Ly
2e6ca38769 am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1 
* commit '85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
  docs: fix bug 5990526
 2012-02-27 08:42:19 -08:00
Robert Ly
da41bcdb70 Merge "docs: fix bug 5990526" into ics-mr1 2012-02-27 08:40:54 -08:00
Xavier Ducrohet
dafc347bba am 44e63a21: Support rendering layout that use the new res-auto namespace. 
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
 2012-02-24 19:32:32 -08:00
Dianne Hackborn
2f171c6e50 am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:25:30 -08:00
Dianne Hackborn
49b0cca899 Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
651a8f4bf9 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:03 -08:00
Dianne Hackborn
a270567a78 Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
The Android Open Source Project
8210d88c03 Reconcile with ics-mr1-release 
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
 2012-02-24 14:05:51 -08:00
Xavier Ducrohet
aafceff69f am 816b873d: Move the automatic namespace outside of the res namespace. do not merge. 
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
 2012-02-23 18:41:48 -08:00
inazaruk
d387bb03e9 am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. 
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
 2012-02-23 18:41:43 -08:00
Andrew Flynn
f1b552b6e0 Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop 2012-02-23 16:09:36 -08:00
Joe Fernandez
892dd2e7a9 am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
  docs: NDK overview, remove x86 instruction set mention (b/6044027)
 2012-02-23 14:24:53 -08:00
Joe Fernandez
2ea80d5afa Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
The Android Automerger
15fe07854f merge in ics-mr1-release history after reset to ics-mr1 2012-02-23 10:45:15 -08:00
Michael Jurka
1836a969f8 am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen 
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
 2012-02-23 08:07:51 -08:00
Scott Main
b38c4a66f3 am 68d97aa2: Merge "docs: fix broken link" into ics-mr1 
* commit '68d97aa2c1ff16f327491fed5afb8b318f034a01':
  docs: fix broken link
 2012-02-22 16:23:03 -08:00
Scott Main
271d668dfd Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Xavier Ducrohet
70eaeb38b8 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
 2012-02-22 10:49:35 -08:00
Xavier Ducrohet
9bbfdcab00 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Rich Hyndman
bce35365bd am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '942b823ce4b2e0e11d395dffb2d340de01811612':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-22 03:43:35 -08:00
Rich Hyndman
862fa82bc9 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00