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

122909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
 2014-09-27 05:14:05 +00:00
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories. 
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
 2014-09-26 17:43:14 -07:00
Dirk Dougherty
8d03b0b987 am afbe165a: Doc change: Add IAB v2 deprecation notice. 
* commit 'afbe165aecb00b74f8228314cc60b28af089e8e3':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-27 00:22:41 +00:00
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch 
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
 2014-09-26 22:23:33 +00:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
smain@google.com
19e884f220 make sdk download links use HTTPS 
bug: 8033954

Change-Id: Idffbb31d397b765fc71ec034d30cc58d1423fdc9
 2014-09-26 12:22:59 -07:00
Kevin Ma
18037f14e8 Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 2014-09-26 18:52:25 +00:00
Kevin Ma
8174879e09 Revert "Revert "DO NOT MERGE Fix race condition between binder deaths"" 
This reverts commit 04c6d73fd0e4472505275688ef8497bc6697647c.

Bug: 17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
 2014-09-26 18:51:16 +00:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Deepanshu Gupta
f202365ecc am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8c61344d89ab3b1f02228b3da10c8377c41960ff':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 06:05:03 +00:00
Deepanshu Gupta
8c61344d89 am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '528b58623feee609055a31e58bf5e1ea3658bf40':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:53:47 +00:00
Deepanshu Gupta
528b58623f am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '941a8f03599b91f752c455dceef993887c4b9b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:43:38 +00:00
Deepanshu Gupta
416b74fe31 am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ab5971d825d9d59f06b49e1f1e66a24df417124e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:43:32 +00:00
Deepanshu Gupta
ab5971d825 am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '1489862ecee4f298de6a7b27789dda08ff4aa4cf':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:34:34 +00:00
Deepanshu Gupta
941a8f0359 am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '0c4893ece99418842538db496bb8d53b767b335b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:32:09 +00:00
Deepanshu Gupta
1489862ece am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '48d0fd99f0a25829f191e7f7ed35cf8d0a2b5902':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:24:06 +00:00
Deepanshu Gupta
0c4893ece9 am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '2889942f4ee7762cdbd097cf3ceea16444f8841a':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:20:48 +00:00
Deepanshu Gupta
48d0fd99f0 am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ee41b79c5735bb3399108bb62de1145fffff3904':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:13:09 +00:00
Deepanshu Gupta
2889942f4e am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'bfeeee8e4a9cf4bf32067c2ca5807cd612564a99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:09:54 +00:00
Deepanshu Gupta
bfeeee8e4a am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'ecbe6045911ac7c05a1e999b966577ef7b1bdc18':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 05:02:22 +00:00
Deepanshu Gupta
ee41b79c57 am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '7d23e405bd3a18f871bcf9856b5a9bcc0ccb1236':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:57:59 +00:00
Deepanshu Gupta
ecbe604591 am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '6950920f19980a2416e156d2337b93e386b3f8be':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:49:31 +00:00
Deepanshu Gupta
7d23e405bd am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'f103317499bdb12cbcac1754899756d22acde986':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:40:53 +00:00
Deepanshu Gupta
6950920f19 am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '1fce990ce9098afe96e75ec1583c771826c50637':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:37:23 +00:00
Deepanshu Gupta
1fce990ce9 am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '04861ed488f5aaa62acbaf903e359ea9edd8e9f9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 04:22:39 +00:00
Deepanshu Gupta
eb31708e7d am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '83951615f564521d542da00d3bf60a372787aced':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 03:00:29 +00:00
Deepanshu Gupta
83951615f5 am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '467aea1722f5cd73d0874502447d947bccd13c99':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:49:04 +00:00
Deepanshu Gupta
467aea1722 am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a39b3b25b947d6c1ab49c08fdcd6f5149f037b20':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 02:07:42 +00:00
Justin Koh
04c6d73fd0 Revert "DO NOT MERGE Fix race condition between binder deaths" 
This reverts commit 8828d86e79424fc1c7b7d1f908e3450879d5cea0.

Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
 2014-09-26 01:29:17 +00:00
Craig Mautner
8828d86e79 DO NOT MERGE Fix race condition between binder deaths 
If a Binder dies there is a race between activity manager and window
manager to see who can handle the binderDied call first. If the
activity manager wins the race it will remove the activity and task
but leave the windows around. Until the WindowState.binderDied call
is made and all animation is complete the windows will try to access
the task that they were associated with.

This fix removes the windows of an activity when the activity is
removed. It also defers removal of the activity and task until
exiting windows have completed their animation.

Fixes bug 17031518.

Change-Id: Idf52f55c5feb0cad4e3664ef2eae5b7e95bbf490
(cherry picked from commit 5acd163b828d5b26408eb3a7904d750a1570239e)
 2014-09-26 01:01:42 +00:00
Deepanshu Gupta
04861ed488 am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '91043364b95fe58225437e2220d497ef6e33edf6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:59:08 +00:00
Deepanshu Gupta
f103317499 am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '93b185e39c5e6a90d413ffa5a2eea740feb7364b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:58:23 +00:00
Deepanshu Gupta
a39b3b25b9 am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '08523e680e1ec1e4ec521c7e732e60fd85f553a4':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:48:26 +00:00
Deepanshu Gupta
a6e2f22666 am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '14ffff154f974bb169b3449ad24c508c836c670c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:47:02 +00:00
Deepanshu Gupta
91043364b9 am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '52be792bad7cbd059daab02a23e28ef1df61f2ce':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:46:07 +00:00
Deepanshu Gupta
93b185e39c am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '363f4d4e2a53774b7b7c1ea995fc912291f5b84e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:45:42 +00:00
Deepanshu Gupta
52be792bad am 27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '27d3b9264e2dcfb86400a60891a5e39cdf027d55':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:36:41 +00:00
Deepanshu Gupta
14ffff154f am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:35:59 +00:00
Deepanshu Gupta
363f4d4e2a am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:34:21 +00:00
Deepanshu Gupta
08523e680e am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '43214e0c19c13acbf1ecd714167abf03283d54ef':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:34:13 +00:00
Deepanshu Gupta
803a59cae7 Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:01:38 +00:00
Deepanshu Gupta
c8cbff8bdc Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:01:08 +00:00
Deepanshu Gupta
43214e0c19 Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:00:44 +00:00
Deepanshu Gupta
8bf221bd70 Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 23:00:17 +00:00
Deepanshu Gupta
27d3b9264e Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
A bug in the framework leads to the wrong argument being passed to
defStyleRes when obtaining styled attributes. The framework however just
ignores the attribute in such a case. LayoutLib logs an error to help
developers find bugs in their code.

The bug was seen when using list as the actionBarNavMode.

This change ignores the attribute if it detects that it's the framework
bug. Also, we change the error to a warning.

Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
 2014-09-25 22:59:58 +00:00
Joe Fernandez
1968b91937 am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit 'b8a60dada505d79341cfa4cc2b9906d892e8298b':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 15:44:50 +00:00
Joe Fernandez
b8a60dada5 Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 2014-09-24 15:39:01 +00:00
Joe Fernandez
57024257e5 docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher 
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
 2014-09-24 08:35:03 -07:00
Jeff Vander Stoep
9aaf54eeb6 am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
  Sanity-check paths of files to be restored
 2014-09-23 17:12:38 +00:00