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

374 Commits

Author SHA1 Message Date
Dirk Dougherty
1ae704b87e resolved conflicts for merge of b08447ba to klp-ub-dev 
Change-Id: I77406f89d3b499f831ba4a66b7bf79039838c5b2
 2013-11-06 15:42:01 -08:00
Dirk Dougherty
4ef4d898f6 resolved conflicts for merge of 790f9183 to klp-ub-dev 
Change-Id: I11c97db0ef83f59d629fb9406bb0e240714e5f89
 2013-11-05 16:17:27 -08:00
Dirk Dougherty
5132fb2c58 Doc change: minor fixes to highlights and images. 
Change-Id: I9dc52258aff3f97b71ff8b749865f699d3c9c0d2
 2013-11-04 11:40:24 -08:00
Dirk Dougherty
b08447ba51 Doc change: Updates to platform highlights. 
Change-Id: I7c4a5f8104dd1887fcac32a525301572243cdb81
(cherry picked from commit e44fce31097a33a6bfaf8225b21047a12584b36c)
 2013-10-31 17:00:29 +00:00
Dirk Dougherty
790f9183ae Doc change: Platform highlights for Android 4.4. 
Change-Id: Ic82ca92c224bdc72bdef5f2fcd7921bc17a601a8
(cherry picked from commit 147a9991988e21c455c86bdca2cadd4873b00054)
 2013-10-31 16:58:22 +00:00
Dirk Dougherty
eb76848f8f Doc change: Google Play services 4.0 reference docs. 
Change-Id: I61c536a80a720364eadec727b9c870d5b869be1a
(cherry picked from commit 28167899617b59874aeeb0f6cd822ca2f6cc9e55)
 2013-10-31 16:57:06 +00:00
Dirk Dougherty
0a5e5bd98c Merge "Doc change: Update landing page for kitkat." into klp-dev 2013-10-31 16:46:47 +00:00
Dirk Dougherty
f42010b171 Doc change: Update landing page for kitkat. 
Change-Id: Ia552577811ed1cafe0a7c4f56bf0c1b55f8c61c0
 2013-10-31 09:45:51 -07:00
Scott Main
6af82cf924 add HCE dev guide 
Change-Id: I48c196f7f4577304b660c52ba5cd847c0cabfaff
(cherry picked from commit c988ee664e9956901df61e2219c92f50bcb60bc0)
 2013-10-31 16:38:25 +00:00
Scott Main
c988ee664e add HCE dev guide 
Change-Id: I48c196f7f4577304b660c52ba5cd847c0cabfaff
 2013-10-31 09:36:54 -07:00
Dirk Dougherty
e44fce3109 Doc change: Updates to platform highlights. 
Change-Id: I7c4a5f8104dd1887fcac32a525301572243cdb81
 2013-10-31 04:53:42 -07:00
Dirk Dougherty
147a999198 Doc change: Platform highlights for Android 4.4. 
Change-Id: Ic82ca92c224bdc72bdef5f2fcd7921bc17a601a8
 2013-10-30 18:42:37 -07:00
Katie McCormick
8d8e5ab7ac Merge "Doc change: new Storage Access Framework doc" into klp-dev 2013-10-31 00:26:24 +00:00
Katie McCormick
a1ca3632bc am 18ffec85: am 928bc43f: am ab642495: Merge "Doc update: Managing System UI class" into jb-mr2-docs 
* commit '18ffec8582b7fed897db12358b464ccfb56808df':
  Doc update: Managing System UI class
 2013-10-30 16:41:50 -07:00
Katie McCormick
928bc43fb9 am ab642495: Merge "Doc update: Managing System UI class" into jb-mr2-docs 
* commit 'ab6424959ca0dd765f37944dbeaa59a50b99d7a4':
  Doc update: Managing System UI class
 2013-10-30 16:33:31 -07:00
Katie McCormick
d20c87c550 Doc update: Managing System UI class 
Change-Id: I8c8f8864411a4be64426e347351690078c922c1c
 2013-10-30 16:23:48 -07:00
Katie McCormick
c46e6767f5 Doc change: new Storage Access Framework doc 
Change-Id: I53393bfbadaf7cd5be95a7b252a2f4b060554db5
 2013-10-30 16:17:34 -07:00
Dirk Dougherty
2816789961 Doc change: Google Play services 4.0 reference docs. 
Change-Id: I61c536a80a720364eadec727b9c870d5b869be1a
 2013-10-30 13:11:50 -07:00
Dirk Dougherty
f04c9b8e85 doc change: Update Google Play Services pages for gouda. 
Change-Id: I222c353a204fcf4594fd8b074889311b67b65ff7
 2013-10-29 18:04:50 -07:00
Dirk Dougherty
593d970615 Doc change: add i/o 2013 design video embeds to videos page. 
Change-Id: I9dc0655671f0365905b01615a64905c12c0a2375
Bug-Id: 11191366
 2013-10-14 18:40:38 -07:00
Scott Main
5a99a7023e am 4dfe8944: Merge "add docs about managing app memory" into jb-mr2-docs 
* commit '4dfe894440f3b1af62df8e6cb74503c86519c74d':
  add docs about managing app memory
 2013-10-14 09:52:07 -07:00
Scott Main
a3f0e01f33 add docs about managing app memory 
Change-Id: I8bd7b05e7ce00faedbbc131a38f2a73637d1b365
 2013-10-11 19:40:36 -07:00
Dirk Dougherty
0c74fc28b7 am 234101a4: Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 
* commit '234101a4c597fe285703f7a012ef9eda6c751578':
  Doc change: add tablet success story and fix a few issues.
 2013-10-10 17:50:21 -07:00
Dirk Dougherty
234101a4c5 Merge "Doc change: add tablet success story and fix a few issues." into jb-mr2-docs 2013-10-11 00:48:14 +00:00
Dirk Dougherty
3f848899f4 Doc change: add tablet success story and fix a few issues. 
Change-Id: Ifdc494270d200604b9a228601b5ead0e8b2c4e3f
 2013-10-10 16:34:40 -07:00
Scott Main
194925f9e8 am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page. 
* commit 'a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
 2013-09-26 16:20:41 -07:00
Scott Main
a8f519ff9c add Wallet Instant Buy and Google Cloud Platform to the Google services landing page. 
Change-Id: I196ac5955477cd822bbf78a9cd4fd53a3d8fbd5f
 2013-09-26 16:17:57 -07:00
quddusc
40765a4a53 am 2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
* commit '2ef3952d8e62b71baca176b3e17315a37facd34a':
  cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
 2013-08-29 11:12:44 -07:00
quddusc
2ef3952d8e cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7 
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
 2013-08-29 10:52:49 -07:00
Dirk Dougherty
6d3fbd0073 am 8236443b: Doc change: update spam policy image. 
* commit '8236443bdac2ba7c7630ddcc4ce9a18a03fe31a1':
  Doc change: update spam policy image.
 2013-08-28 11:42:05 -07:00
Dirk Dougherty
8236443bda Doc change: update spam policy image. 
Change-Id: Ib19ea838f0f72725cedf2cea8aff505ccc477a45
 2013-08-28 11:37:05 -07:00
Dirk Dougherty
1b6d199009 am 80bd95bf: Merge "Doc change: update Google Play policies descriptions." into jb-mr2-docs 
* commit '80bd95bf86e43e5bbca6a08ede708524e5024a1c':
  Doc change: update Google Play policies descriptions.
 2013-08-23 10:15:42 -07:00
Dirk Dougherty
3d205ab01e Doc change: update Google Play policies descriptions. 
Change-Id: I4ebc985159db5f24632bac38cff63c7b663794b8
 2013-08-23 10:11:44 -07:00
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later. 
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
 2013-08-13 10:57:31 -07:00
Katie McCormick
e78b4f5339 Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-12 12:07:26 -07:00
Scott Main
6dd38cc534 Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later." 
Submitted the original revert too soon.

This reverts commit ebcee19783c4fe5ba776353e95974383850a4685.

Change-Id: I7c76b9c37a8d919cdf319dae1ae8f444300ed3d4
 2013-08-12 17:40:37 +00:00
Scott Main
ebcee19783 Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" 
revert to fix conflicts, i'll fix it all later.

This reverts commit 385bb2eb5184686c2d953fe4757522e61acb3392.

Change-Id: Ie0a995b185c3354ff369fce87f73810c1027a0b2
 2013-08-12 17:08:28 +00:00
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
385bb2eb51 resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev 
Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
 2013-08-09 17:55:05 -07:00
Katie McCormick
53d9628d08 Doc change: collapse key fix. 
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
 2013-08-09 15:32:23 -07:00
Scott Main
d041301adb new class on using action bar for training basics 
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
 2013-08-01 14:56:00 -07:00
Dirk Dougherty
446322323c Doc change: add gpg developer stories. 
Change-Id: I3066019e7dc341e48c681f6e3089df334b9739a1
(cherry picked from commit 1698800c66b7c97f19ce8777dc79e7047f77e38f)
 2013-07-26 19:55:39 +00:00
Joe Fernandez
21a1df23cd Merge "docs: Support Library Guide" into jb-mr2-ub-dev 2013-07-24 06:13:38 +00:00
Dirk Dougherty
3ab0470cf1 Doc change: Platform highlights for Android 4.3. 
Change-Id: If178b8268d4d703d06266cb3adc0c124e596378c
 2013-07-23 21:37:56 -07:00
Joe Fernandez
5ffbba6455 docs: Support Library Guide 
Extending the Support Library documentation to explain how to
support mainstream features such as ActionBar across multiple
versions of Android.

Change-Id: I8ddeeb912884a39b2fb8717129d22993102ef650
 2013-07-23 21:26:49 -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
Scott Main
e04c454302 update action bar guide for support lib ABC 
Change-Id: Ie4594b3a0e0a686ed37d858788c7c747a1ee09e0
 2013-07-23 12:17:05 -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