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

3580 Commits

Author SHA1 Message Date
Scott Main
f5d4970a1f am 9047e466: Merge "docs: fix markup bug; remove extra </div>" into jb-dev 
* commit '9047e46657ad21e73bae5465ef00e29a84ad53a4':
  docs: fix markup bug; remove extra </div>
 2012-08-15 14:49:33 -07:00
Scott Main
9047e46657 Merge "docs: fix markup bug; remove extra </div>" into jb-dev 2012-08-15 14:47:30 -07:00
Scott Main
02d74a28ee docs: fix markup bug; remove extra </div> 
Change-Id: I9d1fd280b5f077a423f12ce8e226d09e5e9f7b2b
 2012-08-15 14:42:48 -07:00
Scott Main
23e708821e am 7e6eeada: am 1d64f9f4: am 13f5ed25: am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 
* commit '7e6eeadadb7f306e206ee8b12bf579f62bfcbb82':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
 2012-08-15 10:26:53 -07:00
Scott Main
1d64f9f4da am 13f5ed25: am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 
* commit '13f5ed254a96273f6e7c6d5dc017465acd607283':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
 2012-08-15 10:21:53 -07:00
Scott Main
13f5ed254a am 18c2045b: Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 
* commit '18c2045bed1ee4e5615947bdc4539a6b4d4a1d23':
  revise info on Search button availability... behavior not guaranteed either bug: 6966922
 2012-08-15 09:49:47 -07:00
Scott Main
18c2045bed Merge "revise info on Search button availability... behavior not guaranteed either bug: 6966922" into jb-dev 2012-08-15 09:47:27 -07:00
Scott Main
e0a21c27f9 am e768571e: am 22a65164: am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelope 
* commit 'e768571e22308d67df053d94ac487cf45d1b9334':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:31:50 -07:00
Scott Main
22a65164d2 am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect al 
* commit 'd54bc8009f745a5f730fa013bb0084c502b18aa9':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:27:40 -07:00
Scott Main
d54bc8009f am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to ch 
* commit '71c4fc818dae494f4acdb24bb6d1b899ddc5e07d':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:26:14 -07:00
Scott Main
71c4fc818d Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future." into jb-dev 2012-08-14 14:23:40 -07:00
Scott Main
911711fd31 revise info on Search button availability... behavior not guaranteed either 
bug: 6966922

Change-Id: I4122e6fb99b95da3f53b56333a5f27d2adde6d44
 2012-08-14 13:20:53 -07:00
Scott Main
045c6f4e64 am a640bb13: am a5d1dc9d: am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit 'a640bb13ed893afd0eaed2dbc7363118caf27209':
  docs: misc bug fixes from external issues
 2012-08-14 12:47:31 -07:00
Scott Main
a5d1dc9d03 am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit 'bd63fb875c49d69d5969df35ae159bd17cadb730':
  docs: misc bug fixes from external issues
 2012-08-14 12:42:12 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
 2012-08-14 12:40:41 -07:00
Scott Main
d632b43fab docs: change download URLs for design assets. 
These new URLs are dummies that are handled by a redirect rule for
all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/
Using this redirect allows us to change the storage location of the download assets in the future.

Change-Id: I0dc6ecc1a6898f1256ba4c9ff90b619366e47629
 2012-08-14 11:44:09 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues 
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
 2012-08-13 19:12:13 -07:00
Joe Malin
929b7ef46a am ad4abf7d: am 863b19bc: Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev 
* commit 'ad4abf7dcae59f3b90929ba7080f4c1b012b1b1f':
  Bug 6954576: Typos and errors in topic
 2012-08-13 18:07:30 -07:00
Nick Kralevich
cbb6011778 am f5fb3bdf: am ab7cd91a: Merge "Spelling." into jb-mr1-dev 
* commit 'f5fb3bdf7c5554c5a2428d92add46bfef02cbd39':
  Spelling.
 2012-08-13 18:04:36 -07:00
Joe Malin
863b19bc8f Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev 2012-08-13 18:02:16 -07:00
Nick Kralevich
ab7cd91a79 Merge "Spelling." into jb-mr1-dev 2012-08-13 17:59:55 -07:00
Nick Kralevich
13cd6420a0 Spelling. 
Change-Id: Ie69d99139355b66e9bb62087cd5f6cd677a51cfa
 2012-08-13 17:52:17 -07:00
Peter Ng
a00db02d18 am 7e78eb0d: am 806d53c3: am 55ed7e34: 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 '7e78eb0d9f28ebcc371ded8ad35eb9695d90334c':
  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 17:03:21 -07:00
Peter Ng
aceba227b2 am d6bbf913: am 97b6f6cf: am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit 'd6bbf913fea2ae73cec8ff6542a6c7d260dfdddc':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 17:03:14 -07:00
Peter Ng
375766f710 am 5169a633: am 6fc1be55: am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '5169a6335f9e1d46a4d71b11406d057010c7f624':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:59:33 -07:00
Peter Ng
806d53c3db am 55ed7e34: 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 '55ed7e34b981e9725f664587c6ca1f43d78c3f6e':
  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:59:07 -07:00
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
fa4e9c0610 am 886590ab: am 68b3f065: am 922e038b: am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev 
* commit '886590aba861cf7f6364371b5988630912cf5d9b':
  fix misc doc bugs from external issues
 2012-08-10 12:44:16 -07:00
Scott Main
fded099c12 am 95c26134: am 2d22538f: am 4b4bd1b3: am 607079d8: docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps 
* commit '95c261344e17235bc75be09d465653be4d5b74f5':
  docs: SDK r20.0.3, Support Library r10 Release Notes plus some OCD cleanup to the ADT install steps
 2012-08-10 12:44:09 -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
Joe Malin
cbd0e09aa7 am fba8c80b: am 4aa3c034: Fix contentprovider docs android:exported default 
* commit 'fba8c80b26c289032c265faf2425852cc3fac9b6':
  Fix contentprovider docs android:exported default
 2012-08-09 14:22:49 -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
9663215edc am ebd997d8: am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev 
* commit 'ebd997d8662e52a64318b1f3c531d61e6e76bfc3':
  Content Providers: change default for android:exported
 2012-08-08 10:54:26 -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