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

63690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Ly
37f9360a21 am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':
 2012-03-01 14:15:03 -08:00
Robert Ly
ca7d7541c4 am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'd70eaff41ce4e033656eeebb5eb7153b49d2ac5a':
  fix bug 5942522
 2012-03-01 14:13:15 -08:00
Robert Ly
3c78e101ec am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:11:05 -08:00
Robert Ly
d70eaff41c am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522
 2012-03-01 14:10:46 -08:00
Robert Ly
941ff38d05 Merge "fix bug 5942522" into ics-mr1 2012-03-01 14:08:40 -08:00
Robert Ly
a231071249 am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '9d36dcc0f29d7afc7656d9320dd3a5edfb980989':
 2012-03-01 12:48:42 -08:00
Robert Ly
b4afb9a89e am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit '8125b0b4343b7f480196ce73103ca00cdf64f9e5':
  docs: fix bug 5878445
 2012-03-01 12:47:44 -08:00
Robert Ly
8125b0b434 am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
  docs: fix bug 5878445
 2012-03-01 12:44:36 -08:00
Robert Ly
9d36dcc0f2 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
dcc910ea6e Merge "docs: fix bug 5878445" into ics-mr1 2012-03-01 12:42:24 -08:00
Tsu Chiang Chuang
4b1afab106 extend timeout to allow for more time for the device to connect. 
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
 2012-03-01 12:28:14 -08:00
The Android Open Source Project
efa4943952 am 4f306bec: Reconcile with ics-mr1-release 
* commit '4f306becef17ea986522202cc8c90b0e32e2ded1':
 2012-03-01 10:46:52 -08:00
The Android Open Source Project
4f306becef Reconcile with ics-mr1-release 
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
 2012-03-01 10:40:13 -08:00
The Android Open Source Project
956abc304f am f8e58c8b: Reconcile with ics-mr1-release 
* commit 'f8e58c8b4e8e2ef84e7213401ab595ce084f5612':
 2012-03-01 10:14:27 -08:00