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

153382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
8884edaaeb am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:10:55 +00:00
Luan Nguyen
f082f8980e Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 2015-01-21 16:19:20 +00:00
Luan Nguyen
46e804d2a7 docs: Fix conditional in ambient mode check method (18832168). 
Fix issue with non existent variable (18832287).
Fix issue with outdated instructions (18832293).
Fix issue with misleading time tick (18832171).

bug: 18832168
bug: 18832171
bug: 18832287
bug: 18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
 2015-01-21 08:00:45 -08:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Scott Rowe
224624e8e6 am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions
 2015-01-17 02:28:51 +00:00
Scott Rowe
78001f9338 am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot
 2015-01-17 02:28:47 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
e255cb0f9e am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw 
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
 2015-01-16 15:42:26 -08:00
Quddus Chong
930ac01fd7 am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:21:34 +00:00
Joe Fernandez
90d2aca7f0 am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:15:25 +00:00
Ricardo Cervera
73f36d4746 am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:15:21 +00:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets. 
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
 2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc 
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
 2015-01-16 11:18:10 -08:00
Joe Fernandez
aafd29beb8 am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo
 2015-01-16 18:56:25 +00:00
Joe Fernandez
c6f70adf24 am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager
 2015-01-16 18:52:12 +00:00
Ricardo Cervera
85bfcbd3e2 am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 18:52:08 +00:00
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +00:00
Dirk Dougherty
d1ff86058a Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 2015-01-16 00:41:56 +00:00
Dirk Dougherty
27ab5a079b Doc change: Add new analytics information to Distribute. 
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
 2015-01-15 16:28:13 -08:00
Rich Slogar
3b7dbd66d8 Merge "docs: build link update" into lmp-docs 2015-01-16 00:27:50 +00:00
Rich Slogar
485b9566a9 Merge "docs: Plugin reference update" into lmp-docs 2015-01-16 00:27:05 +00:00
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update 
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
 2015-01-15 16:20:44 -08:00
Luan Nguyen
d3cc11a164 docs: Remove reference to handheld app for bitmap resource locations. 
bug: 17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
 2015-01-15 09:24:09 -08:00
Scott Rowe
c222198a2c docs: removing code captions 
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
 2015-01-14 14:27:30 -08:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Scott Rowe
8443fad483 docs: Add screenshot 
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
 2015-01-12 14:50:50 -08:00
Ricardo Cervera
a87f35555d am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 
* commit 'd8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-12 21:53:27 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
661ca54706 am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '8062f1f34113f4d73d37ebb57245342cca9d8f9c':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:27:24 +00:00
Joe Fernandez
8062f1f341 Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 2015-01-12 21:23:17 +00:00
Joe Fernandez
1946978c53 am 76110e7c: docs: Remove Wear preview reference docs 
* commit '76110e7c46297a221d8f2c92fbaef46b6f405294':
  docs: Remove Wear preview reference docs
 2015-01-12 21:16:26 +00:00
Ricardo Cervera
afd23aba8e docs: Add parent calls to WatchFaces snippet. 
Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
 2015-01-12 12:54:32 -08:00
Joe Fernandez
76110e7c46 docs: Remove Wear preview reference docs 
These docs are out of date and unreachable due to redirect rules.

Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
 2015-01-12 10:28:03 -08:00
Joe Fernandez
05d9a5107f docs: Removing obsolete L-Preview docs and images 
- /preview/images/
- TV Preview index pages
- Notifications preview page

Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
 2015-01-12 10:20:41 -08:00
Eric Gilmore
10b829e126 am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit 'fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
  Adding Android Fundamentals video.
 2015-01-12 17:07:12 +00:00