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

177823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
a5de0f30cf am cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002" into mnc-preview-docs 
* commit 'cdc28652601d977bd0964d088b9070f6d2ef32d9':
  docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
 2015-06-19 23:49:11 +00:00
Quddus Chong
4437a1294e Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976" into mnc-preview-docs 2015-06-19 23:37:43 +00:00
Quddus Chong
cdc2865260 Merge "docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002" into mnc-preview-docs 2015-06-19 23:37:13 +00:00
Filip Gruszczynski
73187e5761 am dd91362c: Make sure home activity gets resumed after started. 
* commit 'dd91362c2c65dbcd781034a16f293d5489946f3e':
  Make sure home activity gets resumed after started.
 2015-06-19 23:28:10 +00:00
Joe Fernandez
765255b412 am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '6f8dab04572c772decef9b7ec5380f8e240a51ce':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-19 23:01:45 +00:00
David Friedman
c3fbb0ce6c am bee8d60a: Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time. 
* commit 'bee8d60a1cdfb380904f8770d933e9031c7f9ff3':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-19 23:01:02 +00:00
David Friedman
bee8d60a1c Fixes a typo where parens were used instead of curly braces, preventing 
a link from being created at build time.

Change-Id: I4086ce5054cc2d5cacd72314810b626aee50df62
(cherry picked from commit e62f4540cd6ce6289fb0196c8e30c3a3d6905794)
 2015-06-19 22:49:40 +00:00
Joe Fernandez
6f8dab0457 Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 2015-06-19 22:49:29 +00:00
Filip Gruszczynski
dd91362c2c Make sure home activity gets resumed after started. 
When there is only one activity and it gets paused, activity manager will
try resuming some other activity. If there is no other activity, it will
start home activity and try to resume it. This will fail, because the
activity stack doesn't want to enter recursive resuming. We need to
detect this situation and schedule additional resume of top activity
after home gets started.

Bug: 21500945
Change-Id: I6ca703f8d97bcc4001e7da4cd5a5db63bfb5c861
 2015-06-19 15:40:47 -07:00
Luan Nguyen
cadd531ecf am 4fdaf938: docs: Design section fixes for new templates 
* commit '4fdaf938ee28577324a3068b915c01deb61ade78':
  docs: Design section fixes for new templates
 2015-06-19 21:49:59 +00:00
Quddus Chong
17f9ea77ac docs: Add link from TV design page on DAC to Android TV spec on Google Design site. 
bug: 21786976

Change-Id: I7bee3feaa60d5a1a35ce2c1d93b957de150e9b86
 2015-06-19 14:30:44 -07:00
Luan Nguyen
4fdaf938ee docs: Design section fixes for new templates 
- Fix a number of pages in the Wear design docs

bug: 21762391
Change-Id: I26c18130cdd925d1b40f525dd209329ca2b5cd15
 2015-06-19 14:18:18 -07:00
Quddus Chong
a19933bc0a docs: Updated Recommending TV Content lesson to support card customization. 
bug: 21787002

Change-Id: I3c94fbce2ac7efff1749b76af3da47506812972c
 2015-06-19 14:03:20 -07:00
Joe Fernandez
a8b518d7c2 am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '041e01bbdffa85b9b5ffba201d36bd566eaa2651':
  updates: build-cmdline-update
 2015-06-19 20:59:03 +00:00
Joe Fernandez
041e01bbdf am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '003f8567defcb88b2e07b3f85f0b43f74d29b322':
  updates: build-cmdline-update
 2015-06-19 20:45:35 +00:00
Joe Fernandez
003f8567de Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 2015-06-19 20:32:34 +00:00
Rich Slogar
d9d05fe358 am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs 
* commit '838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
  docs: sdk-tools 24.3.3 updates
 2015-06-18 23:55:44 +00:00
Rich Slogar
838e4aa6e6 Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs 2015-06-18 23:47:28 +00:00
Rich Slogar
1ba81cff91 docs: sdk-tools 24.3.3 updates 
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
 2015-06-18 16:36:52 -07:00
Wei Liu
1dac6bd9fb am ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured. 
* commit 'ae363d2db4398a695606c254b88be8940139edd1':
  Wear doesn't need Shell to send notification when bugreport captured.
 2015-06-18 23:24:41 +00:00
Bryce Lee
685ed12b5d Turn off theater mode upon power button press. 
Bug: 20032225
Change-Id: I80dee2981a8c4ccae5e02b56b7f4ef0f1bd6e169
 2015-06-18 14:39:14 -07:00
Wei Liu
ae363d2db4 Wear doesn't need Shell to send notification when bugreport captured. 
b/19179040

Change-Id: Iec74e1e55adee16c8674f28a6e7d697499b85acf
 2015-06-17 15:32:05 -07:00
Quddus Chong
93bd81346d am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs 
* commit 'eae09b4a642bb30d5fd8ff90796e410197d71c95':
  docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
 2015-06-17 16:23:38 +00:00
Quddus Chong
eae09b4a64 Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs 2015-06-17 16:13:21 +00:00
Luan Nguyen
0752aa54a0 am 5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs 
* commit '5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
  docs: Update JavaDoc links for Watch Face class.
 2015-06-17 15:03:04 +00:00
Luan Nguyen
ce26f29113 am 5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs 
* commit '5980ae8f06d5a56a5bfc763729533d975079b801':
  docs: Update JavaDoc reference links for Create Wearable Apps class
 2015-06-17 15:02:59 +00:00
Luan Nguyen
474b4775ed am d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs 
* commit 'd548b29def4006c0a19df090189198e51715bccd':
  docs: Update JavaDoc ref links for UI training.
 2015-06-17 15:02:55 +00:00
Luan Nguyen
5cef09b075 Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs 2015-06-17 14:55:45 +00:00
Luan Nguyen
5980ae8f06 Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs 2015-06-17 14:54:51 +00:00
Luan Nguyen
d548b29def Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs 2015-06-17 14:54:30 +00:00
Joe Fernandez
31217aa591 am e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 
* commit 'e343e673eca0c0e3b943ce7ddd27b37e29a873f4':
  Update landing page link to skip the Preview landing page plus copy edit
 2015-06-17 00:01:57 +00:00
Joe Fernandez
e343e673ec Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs 2015-06-16 23:54:34 +00:00
Quddus Chong
83ee59d5de am 375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628 
* commit '375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
  docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug: 21400628
 2015-06-16 22:05:54 +00:00
Quddus Chong
375ad9e1eb docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. 
bug: 21400628

Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
 2015-06-16 14:54:29 -07:00
Quddus Chong
513cf16d5e docs: Updated Android TV landing page and Live TV training to support channels. 
bug: 21786387

Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149
 2015-06-16 11:27:52 -07:00
Andrew Solovay
c75034f1e4 am c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 
* commit 'c7965b024d660b62e5500e4bb8a3f942960dddf1':
  docs: Added new "100 days" video to AfW landing page
 2015-06-16 17:57:03 +00:00
Andrew Solovay
c7965b024d Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs 2015-06-16 17:48:46 +00:00
Quddus Chong
418ff64748 am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 
* commit '79b30681bbe26b95a8705e17957c1063517ec8f3':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571
 2015-06-15 22:59:13 +00:00
Quddus Chong
79b30681bb Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 2015-06-15 22:42:43 +00:00
Quddus Chong
e08a39c0cf docs: Fixed broken links in TV publishing checklist. 
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
 2015-06-15 15:39:46 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
John Spurlock
c0d849348a am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.
 2015-06-15 22:23:24 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00
Luan Nguyen
aa3315d6b1 docs: Update JavaDoc reference links for Create Wearable Apps class 
bug: 21723175
Change-Id: I3afc72be12e4c08b8dfa0380e315ef5709e2b27c
 2015-06-15 14:45:25 -07:00
Andrew Solovay
789eddfbd6 docs: Added new "100 days" video to AfW landing page 
See first comment for doc stage location.

Change-Id: Ic05d35efe8a8529d6cc45ba4e055a137ce88f945
 2015-06-15 11:58:53 -07:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan. 
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
 2015-06-15 17:24:57 +00:00
Diego Perez
fa794eb002 am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '2f7103565cf1732d6d1281195cfa49a1564751d7':
  Fix for shadows on theme editor
 2015-06-15 10:14:30 +00:00
Diego Perez
40a216d959 am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit 'df6f63badfe2572284dad8e34f152fd1c24a873e':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 10:14:24 +00:00
Diego Perez
2f7103565c am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
  Fix for shadows on theme editor
 2015-06-15 10:04:02 +00:00
Diego Perez
df6f63badf am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '2422011d867f4d4516605148641bbeb7d9c2501b':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 10:03:58 +00:00