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

5160 Commits

Author SHA1 Message Date
Scott Main
b478b10f34 Revert "Doc change: collapse key fix." 
To resolve conflict. I'll fix it all later.

This reverts commit 53d9628d080aa7339b724a994607022c5386a566.
 2013-08-12 09:57:24 -07:00
Katie McCormick
53d9628d08 Doc change: collapse key fix. 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-09 15:32:23 -07:00
Dirk Dougherty
38d4cfd4a1 Merge "Doc change: fix reference to getBestDateTimePattern()." into jb-mr2-dev 2013-07-24 18:18:14 +00:00
Dirk Dougherty
218dd76e98 Doc change: fix reference to getBestDateTimePattern(). 
Change-Id: Iad96f4079390e3589d21402fc8e01d6446f001b3
 2013-07-24 11:16:28 -07:00
Dirk Dougherty
ac6be10544 Doc change: remove devices listed for vp8 hw encoder in highlights. 
Change-Id: I8058981fc90270abcdecd415c593a3211afe4acb
 2013-07-24 10:50:47 -07:00
Dirk Dougherty
58729dd602 Merge "Doc change: update carousel on develop home." into jb-mr2-dev 2013-07-24 06:47:27 +00:00
Dirk Dougherty
9ce329d0c7 Doc change: update carousel on develop home. 
Change-Id: Iada49cfb6ad2f13967d8e7bd72ac08d9977feb5c
 2013-07-23 23:40:52 -07:00
Dirk Dougherty
144479f255 Merge "Doc change: Platform highlights for Android 4.3." into jb-mr2-dev 2013-07-24 04:48:54 +00:00
Dirk Dougherty
3ab0470cf1 Doc change: Platform highlights for Android 4.3. 
Change-Id: If178b8268d4d703d06266cb3adc0c124e596378c
 2013-07-23 21:37:56 -07:00
Scott Main
538ccd69e2 Merge "update usb driver doc with download link; delete revision notes" into jb-mr2-dev 2013-07-24 01:17:00 +00:00
Joe Fernandez
cd76edb929 Merge "docs: OpenGL ES 3.0 dev guide update" into jb-mr2-dev 2013-07-23 22:52:14 +00:00
Joe Fernandez
b5c29e75a0 docs: OpenGL ES 3.0 dev guide update 
Change-Id: I46b9aee4c6b31e1ac6148f79b8607292b04f69c6
 2013-07-23 15:48:30 -07:00
Scott Main
2edf372ed2 fix javadoc error 
Change-Id: Ieae3e73cda9541e774626fbd73100cdadc1513ad
 2013-07-23 13:52:05 -07:00
Scott Main
9460f4072a update usb driver doc with download link; 
delete revision notes

Change-Id: I325137a026ea99cb2cd5d5f4689a9c1ee5942a92
 2013-07-23 13:41:38 -07:00
Scott Main
3dee8aaf17 Merge "update action bar guide for support lib ABC" into jb-mr2-dev 2013-07-23 20:21:13 +00:00
Dirk Dougherty
0acf946bb4 Doc change: Add Colopl video to carousel and spotlight. 
cherrypick/merge of I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93

Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
 2013-07-23 12:33:06 -07:00
Scott Main
e04c454302 update action bar guide for support lib ABC 
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
 2013-07-23 12:17:05 -07:00
Joe Fernandez
c4624d2efb Merge "docs: Android 4.3 Platform Release Notes" into jb-mr2-dev 2013-07-22 20:57:20 +00:00
Joe Fernandez
b5fff750e1 docs: Android 4.3 Platform Release Notes 
In addition to platform notes, modified the SDK Manager update
warning to advise downloading of SDK Tools 22 or higher. This
dependency is based on the updating of the SDK repository
schema. The last update was repository-8 with the SDK 22.0.0
release, according to raphael@.

Change-Id: Icaaf39a6d49eccdc926aa4c4249db8a0b1d095a7
 2013-07-22 12:54:02 -07:00
Joe Fernandez
60c4b16e28 Merge "docs: NDK r9 Release Notes" into jb-mr2-dev 2013-07-22 16:13:20 +00:00
Joe Fernandez
bdbe56f6a8 docs: NDK r9 Release Notes 
Change-Id: I43cae1e306a8313ab2d003dbb762977f75bf8208
 2013-07-19 17:04:02 -07:00
Joe Fernandez
ab00d352ff am 658374d5: am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '658374d56577a4f8864ba3c7ed8f2e425d13d997':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:05:12 -07:00
Joe Fernandez
658374d565 am 2685febd: am 6f75a73c: Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 
* commit '2685febd0d51bac4da755756b5348eb95c57ef73':
  docs: Android SDK 22.0.4 Release Notes
 2013-07-19 13:02:24 -07:00
Joe Fernandez
6f75a73c04 Merge "docs: Android SDK 22.0.4 Release Notes" into jb-mr1.1-ub-dev 2013-07-19 19:55:48 +00:00
Joe Fernandez
5b7e6a335e docs: Android SDK 22.0.4 Release Notes 
Change-Id: Ia140f81dce8352860149cf709e1ed0be46c052a0
 2013-07-19 11:47:00 -07:00
Scott Main
ca3b4e9b7e remove significant motion 
Change-Id: I764d7253d9eb4aa9f7e94f5628a29f648fd9811b
 2013-07-18 16:10:37 -07:00
Scott Main
1be763494e Merge "more details about account access in restricted profiles" into jb-mr2-dev 2013-07-18 22:46:12 +00:00
Scott Main
d3ed45f841 am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit '991487c635ea0cd9ccfaae8e030325c2e8be7a3f':
  fix typo in code sample
 2013-07-18 15:22:16 -07:00
Scott Main
991487c635 am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev 
* commit '9a1f106d9ef33a3ea22d7b34d736586d4fae0447':
  fix typo in code sample
 2013-07-18 15:19:39 -07:00
Scott Main
34a1fa4389 Merge "fix typo in code sample" into jb-mr1.1-ub-dev 2013-07-18 22:13:56 +00:00
Scott Main
f128275bdc more details about account access in restricted profiles 
Change-Id: I2710c3e8736748ca3080ee88f076255a6639b1e3
 2013-07-18 15:09:03 -07:00
Scott Main
d25cc954ee fix typo in code sample 
Change-Id: Ic2e36d321f8bc3c414f8cef82319ea376eaa296e
 2013-07-18 10:18:57 -07:00
Dirk Dougherty
e0380d8fe6 resolved conflics for merge of 54201120 to jb-mr2-dev 
Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa
 2013-07-17 18:44:03 -07:00
Dirk Dougherty
5420112070 am 7eae1ef0: am c7e4be8a: Doc change: Add Colopl video to carousel and spotlight. 
* commit '7eae1ef0d972911d8225de6aeebf33b806ec7037':
  Doc change: Add Colopl video to carousel and spotlight.
 2013-07-17 18:19:38 -07:00
Dirk Dougherty
c7e4be8abd Doc change: Add Colopl video to carousel and spotlight. 
Change-Id: I70b1633ea9f6c48f76f88d08b7e9fc287f7dde93
 2013-07-17 18:00:35 -07:00
Roman Nurik
5c38799b54 Add Flo to device art generator. 
Change-Id: I69e5d3ff3685c250d3c44bc616aec515ebc4835e
 2013-07-16 14:32:12 -07:00
Scott Main
c0f5bb70b7 am ca4b112e: am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit 'ca4b112eb243b1350aba000c4f021574be25bd96':
  add warning for Windows users and fix typos
 2013-07-12 14:20:11 -07:00
Scott Main
ca4b112eb2 am 546ac85a: am ad17523d: add warning for Windows users and fix typos 
* commit '546ac85a834cf033cf1f3ce82624f1f4a63d099f':
  add warning for Windows users and fix typos
 2013-07-12 14:17:30 -07:00
Scott Main
ad17523da9 add warning for Windows users and fix typos 
Change-Id: I694baa83cde2b97cf0159a75358fa129bd656da3
 2013-07-12 14:09:38 -07:00
Scott Main
c079e43fc3 am e920ab1a: am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'e920ab1a82327976e0a25842d7d57dc7a92ba604':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:09:53 -07:00
Scott Main
e920ab1a82 am a618e938: am c660c608: Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 
* commit 'a618e93891603f825fd2c0ec1a67c96c29863dcd':
  add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017
 2013-07-11 18:08:01 -07:00
Scott Main
c660c608e7 Merge "add Toshiba usb driver link delete Fujitsu-Toshiba bug: 9755017" into jb-mr1.1-ub-dev 2013-07-12 01:03:22 +00:00
Dirk Dougherty
e470967919 am c1addd47: am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c1addd4750be5b1721a8668a110e74fa59e476c6':
  Doc change: Update gcore reference docs.
 2013-07-11 18:03:17 -07:00
Dirk Dougherty
c1addd4750 am c7da42d7: am f7832a35: am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'c7da42d76470c4e9fb541058e942e31163275b83':
  Doc change: Update gcore reference docs.
 2013-07-11 18:01:26 -07:00
Dirk Dougherty
f7832a35f3 am d6bbda24: am bc5f9b66: Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 
* commit 'd6bbda24150eddc59865133377f6b41c8a1ed3b5':
  Doc change: Update gcore reference docs.
 2013-07-11 17:56:35 -07:00
Dirk Dougherty
bc5f9b6674 Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs 2013-07-12 00:50:59 +00:00
Scott Main
24810c6f58 am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '3c13e5284e83390301bf3306e5d77f7014483ea0':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:41:48 -07:00
Scott Main
3c13e5284e am 536fa1bb: am 84ad0894: fix markup error in download button and fix transition to install/update guide 
* commit '536fa1bbe10b793e7c5d585c974693349fb8a4f5':
  fix markup error in download button and fix transition to install/update guide
 2013-07-11 17:38:31 -07:00
Scott Main
84ad0894be fix markup error in download button and fix transition to install/update guide 
Change-Id: I54b6ed06247ff7456089058549e373a19d9e5016
 2013-07-11 17:33:55 -07:00
Scott Main
57b0fed7a9 am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:44:58 -07:00