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

581 Commits

Author SHA1 Message Date
Scott Main
537b222514 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-05 15:17:40 -07:00
Scott Main
d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master 
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
 2010-10-04 18:42:49 -07:00
Scott Main
fc7f39196b am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp

* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-04 15:49:07 -07:00
Scott Main
b3a5b85a61 am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread

* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-04 15:39:24 -07:00
Scott Main
7008b7c1c4 am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide 
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp

* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
  docs: consistency fixit for the quickview boxes in the dev guide
 2010-10-04 14:37:11 -07:00
Scott Main
ae1864c0e7 am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide 
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread

* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
  docs: consistency fixit for the quickview boxes in the dev guide
 2010-10-04 14:32:26 -07:00
Scott Main
6ef33cb3b8 docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 
Change-Id: Ic46ba89cfd0566fea792f65dfa130bef7010b164
 2010-10-04 14:13:54 -07:00
Scott Main
ec80d7f311 docs: consistency fixit for the quickview boxes in the dev guide 
Change-Id: Ibd81091fc6002a77ce43f553b63facec53f16a38
 2010-10-04 13:30:30 -07:00
Dirk Dougherty
934f042a53 am 44fad94a: am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '44fad94aff4165334584cdf8cafcd0885616a44f'

* commit '44fad94aff4165334584cdf8cafcd0885616a44f':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:20:36 -07:00
Dirk Dougherty
44fad94aff am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc' into gingerbread-plus-aosp

* commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:16:12 -07:00
Dirk Dougherty
30f572956e am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics. 
Merge commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread

* commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
  Doc change: update screens support table and remove outdated density/size metrics.
 2010-10-04 11:12:07 -07:00
Dirk Dougherty
ba944ccda3 Doc change: update screens support table and remove outdated density/size metrics. 
Change-Id: I05895b09e2198379a078c12489a2098f84865f58
 2010-10-04 09:48:48 -07:00
Chris Palmer
d4f1436d6a am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 14:18:15 -07:00
Chris Palmer
143e61097e DO NOT MERGE Clarify the explanation of Android's security design. 
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
 2010-09-27 14:12:35 -07:00
Chris Palmer
797256f53e Merge "Clarify the explanation of Android's security design." 2010-09-26 14:17:32 -07:00
Chris Palmer
8daac143a8 Clarify the explanation of Android's security design. 
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I56013bece58df1b6073d4ad0d22f3ee1b147d8c5
 2010-09-24 16:12:30 -07:00
Bill Napier
297bb68d7c Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." 2010-09-23 16:17:11 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 13:10:22 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:41:48 -07:00
Scott Main
6ec3d4f0dc docs: add more info about state list drawable and onclick attribute to Button 
bug:1062898

Change-Id: I633c38fc20a2ebf894237f86648cc0fdc9488b1a
 2010-09-22 18:55:31 -07:00
Joe Malin
0b7a3bc3de Merge "Doc Change: add screenshots to Testing in Eclipse topic" 2010-09-17 12:43:06 -07:00
Joe Onorato
9316232130 Fix broken javadoc. 
Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
 2010-09-16 16:01:53 -04:00
Dirk Dougherty
40da25a26e am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:32:30 -07:00
Dirk Dougherty
8ee9ecc145 am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread 
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
 2010-09-16 11:19:54 -07:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros. 
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
 2010-09-16 11:08:57 -07:00
Bill Napier
8b0b7af010 Fix up some issues with the onCreateContextMenu example in the Notepad tutorial. 
Change-Id: I8e9329d3b9da507effafb886a33a0a7e6574a7c7
 2010-09-15 14:37:58 -07:00
Joe Malin
2c1723ef56 Doc Change: add screenshots to Testing in Eclipse topic 
Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692
 2010-09-10 13:27:23 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Gilles Debunne
6e1df0e981 Progress Dialog documentation example uses onPrepareDialog 
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
 2010-09-09 09:21:53 -07:00
Dirk Dougherty
54ceb6e68e am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50'

* commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:22:33 -07:00
Dirk Dougherty
eed5d17d78 am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp

* commit 'ea68cab8a33d3169de33c7112000cd3dae233afe':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:14:04 -07:00
Dirk Dougherty
ea68cab8a3 am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
Dirk Dougherty
3eb07ea483 Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
Dirk Dougherty
022171be9d Doc change: Add notes for SDK Tools r7 and ADT 0.9.8. 
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
 2010-09-08 15:59:56 -07:00
Elliott Hughes
da2d18a055 am c50a4f37: am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77'

* commit 'c50a4f374adbdfe75621928fb3eb3583e4ff4e77':
  Be brief.
 2010-09-07 18:51:16 -07:00
Elliott Hughes
c50a4f374a am 45cda90b: Merge "Be brief." into gingerbread 
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
 2010-09-07 14:46:15 -07:00
Elliott Hughes
45cda90bdc Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Scott Main
8ae409f501 am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error 
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error
 2010-09-03 13:28:18 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error 
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
 2010-09-03 13:18:28 -07:00
Scott Main
c4367e54e4 fix code snippet error 
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
 2010-09-03 11:03:42 -07:00
Scott Main
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
 2010-09-02 18:53:32 -07:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo 
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
 2010-09-02 18:44:11 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Joe Malin
3e3fcf985f Testing Documentation in the Dev Guide tab 
Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
 2010-08-27 17:59:38 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
 2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
e339c0968e am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
 2010-08-27 12:23:30 -07:00
Brad Fitzpatrick
f52870948d Fix closing tag in docs. 
BUG=2956223

Change-Id: I0772d0b5386a783762319064c13d567c124da394
 2010-08-27 11:22:50 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page. 
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
 2010-08-25 10:31:57 -07:00
Dirk Dougherty
91047d3b2c am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
 2010-08-24 11:54:39 -07:00