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

125599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9fcacf52d0 am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a6e2f22666db39df527cf6698abc2420c208f02c':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:58:18 +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
ac892f688f am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '803a59cae71f8b5a76a48c73579ee6d3d34a78f7':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 00:34:44 +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
2c1ef5328c am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit '1968b91937020e8aa826224642733bbb9055af2e':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 15:56:02 +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
bca67fd7d0 am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
  Sanity-check paths of files to be restored
 2014-09-23 17:26:47 +00:00
Jeff Vander Stoep
bbf7e4af97 am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1cf337a222bbb0e26445e7904ece687af93aac48':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:26:42 +00: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
Jeff Vander Stoep
1cf337a222 am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '52824dab7ba48713411ff3a26580b29aa2088242':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:11:58 +00:00
Jeff Vander Stoep
71b19fc301 am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '5ba31e6e9afb34781fe5b927354502d9c6190bc5':
  Sanity-check paths of files to be restored
 2014-09-23 17:02:13 +00:00
Jeff Vander Stoep
52824dab7b am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1b4f1a794dc90c1ea877af64e8340afe6146584a':
  Change permission guard on bindBackupAgent()
 2014-09-23 17:02:04 +00:00
Jeff Vander Stoep
5ba31e6e9a am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
 2014-09-23 16:50:29 +00:00
Jeff Vander Stoep
1b4f1a794d am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev 
* commit '1c2eaa784b2376b674cf438f42342271c8aa79a8':
  Change permission guard on bindBackupAgent()
 2014-09-23 16:50:16 +00:00
Jeff Vander Stoep
bba797957a am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit '25c866a8efa148886280b34c0413a1c2c20c247f':
  Sanity-check paths of files to be restored
 2014-09-23 16:34:53 +00:00
Jeff Vander Stoep
25c866a8ef am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 
* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored
 2014-09-23 16:24:36 +00:00
Jeff Vander Stoep
e2adb1ff4a Merge "Sanity-check paths of files to be restored" into jb-mr2-dev 2014-09-23 16:13:42 +00:00
Jeff Vander Stoep
7bc601d5d7 Sanity-check paths of files to be restored 
(cherry picked from commit 7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug: 16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
 2014-09-22 23:21:20 +00:00
Ricardo Cervera
44737ea5e5 am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-22 21:44:13 +00:00
Ricardo Cervera
4d0f84bb55 am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-22 21:37:06 +00:00
Ricardo Cervera
556f23aa1a Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 2014-09-22 21:26:35 +00:00
David Friedman
8ec839c95c am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '6bacce4f24ca05fc95c38ea1e7df75dd176b81c2':
  Fixes two typos, one in each file.
 2014-09-22 20:51:29 +00:00
David Friedman
6bacce4f24 am 8dcf1c32: Fixes two typos, one in each file. 
* commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
  Fixes two typos, one in each file.
 2014-09-22 20:41:17 +00:00
Ricardo Cervera
4af9fa4b23 docs: Fixed Developer Tools image. Bug: 17609483 
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
 2014-09-22 19:56:48 +00:00
David Friedman
8dcf1c3229 Fixes two typos, one in each file. 
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
 2014-09-22 10:24:41 -07:00
Dirk Dougherty
6357cd095a am 496cfbf7: Doc change: Add IAB v2 deprecation notice. 
* commit '496cfbf7a83e4c0f66ece27f36c2dc3d31994ff1':
  Doc change: Add IAB v2 deprecation notice.
 2014-09-18 01:00:09 +00:00
Dirk Dougherty
496cfbf7a8 Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-17 15:56:43 -07:00
Robert Ly
4243ec2a84 am 9efd9f60: am fc95c477: docs: edu changes for launch 
* commit '9efd9f607006b3e02cda714901884e1ce22475d3':
  docs: edu changes for launch
 2014-09-17 15:33:16 +00:00
Robert Ly
9efd9f6070 am fc95c477: docs: edu changes for launch 
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
  docs: edu changes for launch
 2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783 docs: edu changes for launch 
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
 2014-09-17 15:13:09 +00:00
Andrew Solovay
67267dcf90 am 6c6664c9: am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit '6c6664c95d7935398909e798e0aad451a2a83b1b':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:12:12 +00:00
Andrew Solovay
6c6664c95d am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:01:09 +00:00
Andrew Solovay
a209406faa Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 2014-09-17 02:21:10 +00:00
Robert Ly
6641ddf671 am d00b110a: am e152b793: docs: remove fire and forget language from wear docs 
* commit 'd00b110a3b9991553806d196f1115a510a72210c':
  docs: remove fire and forget language from wear docs
 2014-09-15 22:03:04 +00:00
Robert Ly
d00b110a3b am e152b793: docs: remove fire and forget language from wear docs 
* commit 'e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
  docs: remove fire and forget language from wear docs
 2014-09-15 19:27:18 +00:00