drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,157 Commits 1 Branch 0 Tags
Commit Graph

64157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
5186f094ba am 8b0f6881: am a47d88a7: docs: dashboard update for march 5 
* commit '8b0f688156919cec527bc60df43c527d2dd940dc':
  docs: dashboard update for march 5
 2012-03-05 14:39:46 -08:00
Scott Main
a216ff330b am a47d88a7: docs: dashboard update for march 5 
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
 2012-03-05 14:36:47 -08:00
Scott Main
8b0f688156 am a47d88a7: docs: dashboard update for march 5 
* commit 'a47d88a7d25da74319dc3decf80d98516a85fab2':
  docs: dashboard update for march 5
 2012-03-05 14:36:05 -08:00
Scott Main
a47d88a7d2 docs: dashboard update for march 5 
Change-Id: Ic71a478ad8afd818dfe9c0a2341e1d1937be5444
 2012-03-05 14:32:15 -08:00
Scott Main
7342817ec3 am afdf856d: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit 'afdf856d432fe5bae56152e42cb2c28ba63a5af0':
 2012-03-05 13:32:20 -08:00
Scott Main
2814c8be99 am 97aa69d3: am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '97aa69d32f52499db001970829a0e654564ea551':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:27:33 -08:00
Scott Main
afdf856d43 am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:26:26 -08:00
Scott Main
97aa69d32f am 2df6ecc5: docs: add note about declaring file sizes with sample app\'s code 
* commit '2df6ecc508f6b30fd5d005394effa64272584caa':
  docs: add note about declaring file sizes with sample app's code
 2012-03-05 13:25:54 -08:00
Scott Main
2df6ecc508 docs: add note about declaring file sizes with sample app's code 
Change-Id: I7858956916c0db5a585228a890a20fb004155b8c
 2012-03-05 13:22:56 -08:00
Scott Main
668f8125bb am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit 'a7368087d6f1f2682174139d9cacab48dc7bc198':
 2012-03-05 11:56:48 -08:00
Scott Main
6c4faf74ae am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:54:36 -08:00
Scott Main
a7368087d6 am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:52:59 -08:00
Scott Main
6d2a18b51e am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
  docs: updates to OBB guide for naming; plus other edits
 2012-03-05 11:52:41 -08:00
Scott Main
6f63d6fc04 Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1 2012-03-05 11:51:03 -08:00
Scott Main
837a5d83f5 docs: updates to OBB guide for naming; plus other edits 
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
 2012-03-05 11:49:12 -08:00
Scott Main
79003f3594 am bde31762: am 93dc642e: docs: fix misc bugs from external tracker 
* commit 'bde31762f989acbfde92e8f47ceea780cacc4e7a':
 2012-03-05 10:08:54 -08:00
Scott Main
dc022a6f9a am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker 
* commit '08e91352169457ac86a2465e4db867971ce14b10':
  docs: fix misc bugs from external tracker
 2012-03-05 10:07:47 -08:00
Scott Main
bde31762f9 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
Scott Main
08e9135216 am 93dc642e: docs: fix misc bugs from external tracker 
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
  docs: fix misc bugs from external tracker
 2012-03-05 10:06:00 -08:00
Scott Main
93dc642eaf docs: fix misc bugs from external tracker 
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
 2012-03-02 16:55:41 -08:00
The Android Open Source Project
c071d87438 am 37d6d98f: Reconcile with ics-mr1-release 
* commit '37d6d98fe3ea739627e03b78196faba55b427503':
 2012-03-02 16:48:24 -08:00
Scott Main
80bc2bf705 am cc902c78: 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 'cc902c78e41549749ad98d96530bef25a3aeae47':
 2012-03-02 16:44:21 -08:00
The Android Open Source Project
37d6d98fe3 Reconcile with ics-mr1-release 
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
 2012-03-02 16:43:42 -08:00
Scott Main
a9fae13e81 am 9ad705ce: 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 '9ad705ce0b8271931f9a09d181069c7466afade4':
  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:42:36 -08:00
Scott Main
cc902c78e4 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
Scott Main
9ad705ce0b 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:00 -08:00
The Android Open Source Project
552081091d am 3e72c93b: Reconcile with ics-mr1-release 
* commit '3e72c93b1652ec021fa0965e432b508b847b2b74':
 2012-03-02 16:35:27 -08:00
The Android Open Source Project
3e72c93b16 Reconcile with ics-mr1-release 
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
 2012-03-02 16:32:56 -08:00
Scott Main
4143781cde 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

Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
 2012-03-02 16:29:33 -08:00
The Android Automerger
1df09612c2 merge in ics-mr1-release history after reset to ics-mr1 2012-03-02 11:51:23 -08:00
Robert Ly
4c7992e9d2 am d559bc79: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit 'd559bc79d546f1b448cc43851de5f43babc81795':
 2012-03-02 09:10:22 -08:00
Robert Ly
b962b98bef am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1 
* commit '67a15457d184f01fffe162a0983d0b507cb7b358':
  docs: fixing bug 5942573
 2012-03-02 09:09:30 -08:00
Robert Ly
d559bc79d5 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
67a15457d1 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
e5e11fd666 Merge "docs: fixing bug 5942573" into ics-mr1 2012-03-02 09:04:16 -08:00
Dianne Hackborn
d4202c9d13 am 921e8303: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '921e83039d266b6d288fd5e09160d878eccb9e23':
 2012-03-02 08:37:48 -08:00
Dianne Hackborn
5d87d51fab am f65951bf: am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit 'f65951bf5db7a248651cbfa89886d773f95c3e03':
  Make ResolverActivity update dynamically.
 2012-03-02 08:36:05 -08:00
Dianne Hackborn
f65951bf5d am 0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1 
* commit '0dd9ec144b0da8df9d8900d78c8177e761de458d':
  Make ResolverActivity update dynamically.
 2012-03-02 08:33:22 -08:00
Dianne Hackborn
921e83039d 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
0dd9ec144b Merge "Make ResolverActivity update dynamically." into ics-mr1 2012-03-02 08:30:36 -08:00
Adam Powell
d9760a813e am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:52:39 -08:00
Adam Powell
25517fdc53 am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:49:46 -08:00
Adam Powell
637c50db47 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'c7e5a2fe3042014f78667228a92e41d0a19547fd':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:46:26 -08:00
Dianne Hackborn
e8f2c7ff5a Make ResolverActivity update dynamically. 
Watches for package changes so it can dynamically adjust
to reflect the actual list of available activities.

Change-Id: I3a2fef3dac4d13d1b2a7ed6fc117a7b814679669
 2012-03-01 19:14:36 -08:00
Tsu Chiang Chuang
8f0c03b783 am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '673a66e357f49f939cf8e7f603ff14b8474c9032':
 2012-03-01 17:11:22 -08:00
Tsu Chiang Chuang
6053b195bc am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
673a66e357 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
bb69bde593 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:25 -08:00
Tsu Chiang Chuang
3e70127021 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Adam Powell
c7e5a2fe30 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00