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

3579 Commits

Author SHA1 Message Date
Peter Ng
97b6f6cf9a am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit 'ab0b9a9e4ec14d556d4c831168e09714c795fa4a':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:58:59 -07:00
Peter Ng
6fc1be5570 am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit 'f059e531506da8c053324caa3108a932d72da7b3':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:57:15 -07:00
Peter Ng
55ed7e34b9 am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '3e504ac71715a1b152494c9765f41d13bc605b75':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 16:57:05 -07:00
Peter Ng
ab0b9a9e4e am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '68432f7691085b82096518f47703d59e83cb934d':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150 am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '250da641302aa98c91855f195cc881880aa69172':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:55:08 -07:00
Peter Ng
3e504ac717 Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
68432f7691 Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
250da64130 Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 2012-08-13 16:52:38 -07:00
Peter Ng
02123630ca Multiple design styleguide fixes 
-Changing extras to videos
-new bullet item in swipeviews
-new in 4.0 removal
-Ui overview notification info
-reppling typo fixed

Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869

Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
 2012-08-13 13:22:21 -07:00
Scott Main
68b3f065b6 am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev 
* commit '922e038b087076260ae7e29facc8121d46e8ba3c':
  fix misc doc bugs from external issues
 2012-08-10 12:36:34 -07:00
Scott Main
2d22538f29 am 4b4bd1b3: am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps 
* commit '4b4bd1b3456096b5f92372230f4ccae225ddd5c4':
  docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
 2012-08-10 12:36:26 -07:00
Joe Malin
955d7cceda Bug 6954576: Typos and errors in topic 
Change-Id: Ibc42e84b1662d12ca5494a59ad67365759017c1d
 2012-08-10 09:56:54 -07:00
Scott Main
922e038b08 am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev 
* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues
 2012-08-09 17:03:16 -07:00
Scott Main
ea31b47a72 Merge "fix misc doc bugs from external issues" into jb-dev 2012-08-09 17:00:52 -07:00
Scott Main
4b4bd1b345 am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps 
* commit '607079d8098f3bf6632913a6edd0bc6d6f9167d7':
  docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
 2012-08-09 16:43:18 -07:00
Scott Main
cb0b2df114 fix misc doc bugs from external issues 
Change-Id: I11b1d524dd2159b58c65d3ef7a76af15624ae365
 2012-08-09 16:38:12 -07:00
Scott Main
607079d809 docs: SDK r20.0.3, Support Library r10 Release Notes 
plus some OCD cleanup to the ADT install steps

Change-Id: I760ddb284da2a3f53741b75d6ff0e02af8181c9a
 2012-08-09 14:13:22 -07:00
Joe Malin
4aa3c034f5 Fix contentprovider docs android:exported default 
Change-Id: I30682905e99fa3d05b6315c011e290fe509588f4
 2012-08-09 13:02:36 -07:00
Nick Kralevich
9d16c219f1 Merge "Content Providers: change default for android:exported" into jb-mr1-dev 2012-08-08 10:50:05 -07:00
Peter Ng
ed12067b08 updated downloads for styleguide 
-new illustrator stencil

Bug: 6548259
Bug: 6948358

Change-Id: Idd5b590426ba2234c7bcc40a5e9e75464ec10723
 2012-08-07 21:50:22 -07:00
Peter Ng
252d23d8bb Revert "Group revert of the following commits for design docs:" 
This reverts commit c9506415d533c61a9607c5b61a1993747bafb406.
 2012-08-07 20:19:10 -07:00
Katie McCormick
e4fcedff53 Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 2012-08-07 14:22:17 -07:00
Scott Main
a335b06c67 am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '9e28fa459bac0322a5608a4f6c682e0ff9051bed':
  docs: fix hdef variable
 2012-08-07 14:05:32 -07:00
Scott Main
b53e9b42c3 am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file 
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:05:28 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
 2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file 
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable 
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
 2012-08-07 13:59:12 -07:00
Katie McCormick
e5cefd1d52 cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I584ba81e923d4150d2b4aed940d790c8298bae7c
 2012-08-07 13:00:10 -07:00
Nick Kralevich
f097b16cfd Content Providers: change default for android:exported 
Change the default value of android:exported to true
for applications which target a newer API version.
This will help stop inadvertent content provider
exposure to untrusted apps.

Bug: 3306452

Change-Id: I8cb34e823aef9551319951ce92217345c54cee63
 2012-08-07 11:34:00 -07:00
Scott Main
40eee61e25 docs: fix broken links 
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
 2012-08-06 18:04:23 -07:00
Scott Main
baa63509f5 am d7cb3048: am ea837561: Merge "docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such a 
* commit 'd7cb30484ba94ecb8f4844f45742bf2ffc004599':
  docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage.
 2012-08-06 17:03:11 -07:00
Scott Main
d7cb30484b am ea837561: Merge "docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google 
* commit 'ea8375617e0d9099dc156a12989277d320eab1ca':
  docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage.
 2012-08-06 17:01:28 -07:00
Scott Main
ea8375617e Merge "docs: add downloads directory with initial set of current files. This directory is not included in the final docs output, but is merely here as a "master" source for the downloadable bits that we upload and serve from elsewhere, such as from Google Cloud Storage." into jb-dev 2012-08-06 16:57:58 -07:00
Scott Main
1398102c35 am bd24f5cc: am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page 
* commit 'bd24f5cca5e51ba0e819f943b981cf2e9f64ec46':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
 2012-08-06 15:57:53 -07:00
Scott Main
bd24f5cca5 am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page 
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d':
  misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc  code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
 2012-08-06 15:48:08 -07:00
Scott Main
53b0fda5fd misc doc bugs. 
Fix sdk samples path
Fix method signature in fragment doc code snippet
Fix typo in a11y javadoc  code snippet
Fix markup error in brands page
Fix markup error on content providers doc
Fix typo on about>start page

Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
 2012-08-06 15:43:01 -07:00
Dirk Dougherty
6677951135 am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev 
* commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
  Doc change: add trademarks attribution.
 2012-08-02 15:39:55 -07:00
Dirk Dougherty
265eea82ae am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev 
* commit '568db47b770cbfaacdd54914540923258cd6f847':
  Doc change: add trademarks attribution.
 2012-08-02 14:57:50 -07:00
Dirk Dougherty
568db47b77 Merge "Doc change: add trademarks attribution." into jb-dev 2012-08-02 13:42:17 -07:00
Scott Main
26ea2e5df5 am 80adeb53: am 5ae754c9: Merge "fix markup for gl pie" into jb-dev 
* commit '80adeb535f17331dedbbd200c99c366f34d33eeb':
  fix markup for gl pie
 2012-08-02 10:31:44 -07:00
Dirk Dougherty
5baafabafd Doc change: add trademarks attribution. 
Change-Id: If6fa87f1f3e65f509af9b3ed58d3497a46f815a8
 2012-08-02 09:21:30 -07:00
Scott Main
80adeb535f am 5ae754c9: Merge "fix markup for gl pie" into jb-dev 
* commit '5ae754c93a2c713f46e6cdbcab5ef051b5d0b600':
  fix markup for gl pie
 2012-08-01 17:04:58 -07:00
Scott Main
5ae754c93a Merge "fix markup for gl pie" into jb-dev 2012-08-01 16:59:45 -07:00
Katie McCormick
27ed953f63 am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* commit '9f94208953fc8da72140c2964bcf12ff5b485784':
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:53:12 -07:00
Katie McCormick
9f94208953 Merge changes I9bd42a8a,I613d0b12 into jb-dev 
* changes:
  cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
  Doc update: Misc minor GCM updates.
 2012-08-01 16:49:38 -07:00
Scott Main
a18e0b4647 fix markup for gl pie 
Change-Id: I97b40b61f70ecd720f604ceca5849b066cf89988
 2012-08-01 16:31:19 -07:00
Katie McCormick
1cfe4b40d3 am 9c311279: Merge "Doc change: 4K -> 4kb" into jb-dev 
* commit '9c311279726598de073314fb6059feea66957219':
  Doc change: 4K -> 4kb
 2012-08-01 16:24:25 -07:00
Katie McCormick
2184bae4e5 am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev 
* commit '510d817977af6761274e700178a854b9f9160d9c':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1
 2012-08-01 16:22:31 -07:00
Katie McCormick
9c31127972 Merge "Doc change: 4K -> 4kb" into jb-dev 2012-08-01 16:21:53 -07:00