OSDN Git Service
Deepanshu Gupta [Thu, 2 Oct 2014 03:33:42 +0000 (03:33 +0000)]
am
60f3676e: Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
* commit '
60f3676e087db7baa8e67b9cbd18cffc90c4ac09':
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 27 Feb 2014 19:51:50 +0000 (11:51 -0800)]
Add tests to the layoutlib eclipse project. [DO NOT MERGE]
Specify the test folder in the layoutlib/bridge eclipse project.
Also add the sourcepath for layoutlib-api-prebuilt.jar
Change-Id: I194ed182618e564388d6df645e2de7f59897fa1e
(cherry picked from commit
36acf8baebc9ab72b3b5fe75d865399ddf7b0132)
Justin Koh [Wed, 1 Oct 2014 18:00:45 +0000 (18:00 +0000)]
am
37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit '
37185d90a2036ece55991f416fcf7948a2198d97':
DO NOT MERGE Hide the volume panel for watches for now
Justin Koh [Wed, 1 Oct 2014 17:57:58 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
Justin Koh [Wed, 1 Oct 2014 17:42:33 +0000 (10:42 -0700)]
DO NOT MERGE Hide the volume panel for watches for now
Hide the volume panel: it's not usable. Need new design in a future release.
Bug:
17753651
Change-Id: I6f7b0683908407b2c1457379cc6641d25adc5c83
kmccormick [Wed, 1 Oct 2014 17:25:38 +0000 (17:25 +0000)]
am
ae3bd63b: am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
Doc update: Update preprod (staging) instructions.
kmccormick [Wed, 1 Oct 2014 17:08:13 +0000 (17:08 +0000)]
am
a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit '
a1572ffc6b8df1f0da637fdb93b949322fcb3637':
Doc update: Update preprod (staging) instructions.
kmccormick [Wed, 1 Oct 2014 17:02:25 +0000 (17:02 +0000)]
Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
Ricardo Cervera [Wed, 1 Oct 2014 03:08:30 +0000 (03:08 +0000)]
am
781c988a: am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
781c988a767eabf9b1b03b4a74f21e3b687902b6':
docs: ADT beginner text fix
Ricardo Cervera [Wed, 1 Oct 2014 02:57:29 +0000 (02:57 +0000)]
am
ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs
* commit '
ae7b5dc49381e76c82cda928cc37a6a8b529da25':
docs: ADT beginner text fix
Ricardo Cervera [Wed, 1 Oct 2014 02:07:14 +0000 (02:07 +0000)]
Merge "docs: ADT beginner text fix" into klp-modular-docs
Ricardo Cervera [Tue, 30 Sep 2014 22:07:16 +0000 (15:07 -0700)]
docs: ADT beginner text fix
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
kmccormick [Wed, 24 Sep 2014 00:08:33 +0000 (17:08 -0700)]
Doc update: Update preprod (staging) instructions.
Fix for:
b/
17525318
Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
Scott Rowe [Tue, 30 Sep 2014 00:39:49 +0000 (00:39 +0000)]
am
294d5347: am
9d20628b: docs: b/
16044763 Update IAB docs to give notice of v2 turndown
* commit '
294d534787e139119d30eb7a5b4dd1532312018e':
docs: b/
16044763 Update IAB docs to give notice of v2 turndown
Ricardo Cervera [Tue, 30 Sep 2014 00:39:39 +0000 (00:39 +0000)]
am
9f483941: am
808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '
9f48394158bce2984a19fe504b7a7f1f673866f3':
docs: Fixed path for build output.
Justin Koh [Tue, 30 Sep 2014 00:39:16 +0000 (00:39 +0000)]
am
28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
* commit '
28d01e677c05edaa45456a26dff22d1b0fc28164':
DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
Scott Rowe [Mon, 29 Sep 2014 22:53:15 +0000 (22:53 +0000)]
am
9d20628b: docs: b/
16044763 Update IAB docs to give notice of v2 turndown
* commit '
9d20628b4beb38470d4f7d10193ac5a7cc558d41':
docs: b/
16044763 Update IAB docs to give notice of v2 turndown
Scott Rowe [Mon, 29 Sep 2014 21:16:41 +0000 (14:16 -0700)]
docs: b/
16044763 Update IAB docs to give notice of v2 turndown
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
Ricardo Cervera [Mon, 29 Sep 2014 20:43:55 +0000 (20:43 +0000)]
am
808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs
* commit '
808440cd5e1052f21b937cdcb60acecefd57f23c':
docs: Fixed path for build output.
Justin Koh [Mon, 29 Sep 2014 18:24:03 +0000 (18:24 +0000)]
Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev
Ricardo Cervera [Mon, 29 Sep 2014 14:56:29 +0000 (14:56 +0000)]
Merge "docs: Fixed path for build output." into klp-modular-docs
Dirk Dougherty [Sat, 27 Sep 2014 05:20:38 +0000 (05:20 +0000)]
am
5913f406: am
6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs
* commit '
5913f40618494a361b4cc0c79aebdd2f0a9170da':
Doc change: Add new index page for games stories.
Dirk Dougherty [Sat, 27 Sep 2014 05:14:05 +0000 (05:14 +0000)]
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.
Dirk Dougherty [Sat, 27 Sep 2014 03:16:52 +0000 (03:16 +0000)]
Merge "Doc change: Add new index page for games stories." into klp-modular-docs
Dirk Dougherty [Fri, 26 Sep 2014 21:52:48 +0000 (14:52 -0700)]
Doc change: Add new index page for games stories.
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
Dirk Dougherty [Sat, 27 Sep 2014 00:27:26 +0000 (00:27 +0000)]
am
8d03b0b9: am
afbe165a: Doc change: Add IAB v2 deprecation notice.
* commit '
8d03b0b987172e70d0bd6522fadc7505a3ff2b1d':
Doc change: Add IAB v2 deprecation notice.
Dirk Dougherty [Sat, 27 Sep 2014 00:22:41 +0000 (00:22 +0000)]
am
afbe165a: Doc change: Add IAB v2 deprecation notice.
* commit '
afbe165aecb00b74f8228314cc60b28af089e8e3':
Doc change: Add IAB v2 deprecation notice.
Justin Koh [Fri, 26 Sep 2014 20:03:26 +0000 (13:03 -0700)]
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
Ricardo Cervera [Fri, 26 Sep 2014 20:25:02 +0000 (13:25 -0700)]
docs: Fixed path for build output.
http://b.android.com/76374
Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
Kevin Ma [Fri, 26 Sep 2014 19:43:39 +0000 (19:43 +0000)]
am
18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '
18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
Kevin Ma [Fri, 26 Sep 2014 18:52:24 +0000 (18:52 +0000)]
Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
Kevin Ma [Fri, 26 Sep 2014 18:30:37 +0000 (18:30 +0000)]
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
This reverts commit
04c6d73fd0e4472505275688ef8497bc6697647c.
Bug:
17286687
Change-Id: Ic11d1e35198accb5a05cd419f5a522bc39fc789b
Dirk Dougherty [Wed, 17 Sep 2014 22:20:38 +0000 (15:20 -0700)]
Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1
Conflicts:
docs/html/google/play/billing/index.jd
Deepanshu Gupta [Fri, 26 Sep 2014 06:15:55 +0000 (06:15 +0000)]
am
f202365e: 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 '
f202365ecca0b6ed637f679c8dd3a36ff850ddfe':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 06:05:03 +0000 (06:05 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:55:34 +0000 (05:55 +0000)]
am
416b74fe: 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 '
416b74fe31124d21f14bb5900f4872cdf62f08e0':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 05:53:47 +0000 (05:53 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:38 +0000 (05:43 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:43:32 +0000 (05:43 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:34:34 +0000 (05:34 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:32:09 +0000 (05:32 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:24:06 +0000 (05:24 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:20:48 +0000 (05:20 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:13:09 +0000 (05:13 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:09:54 +0000 (05:09 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 05:02:22 +0000 (05:02 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 04:57:59 +0000 (04:57 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 04:49:31 +0000 (04:49 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 04:40:53 +0000 (04:40 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 04:37:23 +0000 (04:37 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 04:22:39 +0000 (04:22 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 03:12:42 +0000 (03:12 +0000)]
am
eb31708e: am
83951615: am
467aea17: am
a39b3b25: (-s ours) am
08523e68: am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
eb31708e7d14db1a54bf0f38452149c7d984517f':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 03:00:29 +0000 (03:00 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 02:49:04 +0000 (02:49 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 02:07:42 +0000 (02:07 +0000)]
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]
Justin Koh [Fri, 26 Sep 2014 01:41:55 +0000 (01:41 +0000)]
am
04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"
* commit '
04c6d73fd0e4472505275688ef8497bc6697647c':
Revert "DO NOT MERGE Fix race condition between binder deaths"
Justin Koh [Fri, 26 Sep 2014 01:29:17 +0000 (01:29 +0000)]
Revert "DO NOT MERGE Fix race condition between binder deaths"
This reverts commit
8828d86e79424fc1c7b7d1f908e3450879d5cea0.
Change-Id: I211f7b78a286868d8441323ff3c9cf4d7482fb61
Craig Mautner [Fri, 26 Sep 2014 01:20:54 +0000 (01:20 +0000)]
am
8828d86e: DO NOT MERGE Fix race condition between binder deaths
* commit '
8828d86e79424fc1c7b7d1f908e3450879d5cea0':
DO NOT MERGE Fix race condition between binder deaths
Craig Mautner [Thu, 14 Aug 2014 23:08:26 +0000 (16:08 -0700)]
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)
Deepanshu Gupta [Fri, 26 Sep 2014 00:59:08 +0000 (00:59 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:23 +0000 (00:58 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:58:18 +0000 (00:58 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:48:26 +0000 (00:48 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:47:02 +0000 (00:47 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:46:07 +0000 (00:46 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:45:42 +0000 (00:45 +0000)]
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]
Deepanshu Gupta [Fri, 26 Sep 2014 00:36:41 +0000 (00:36 +0000)]
am
27d3b926: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
27d3b9264e2dcfb86400a60891a5e39cdf027d55':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:35:59 +0000 (00:35 +0000)]
am
c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:44 +0000 (00:34 +0000)]
am
803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
803a59cae71f8b5a76a48c73579ee6d3d34a78f7':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:21 +0000 (00:34 +0000)]
am
8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
8bf221bd706a1bcb18f2c14cacbe4edbbc0a3a61':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Fri, 26 Sep 2014 00:34:13 +0000 (00:34 +0000)]
am
43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE]
* commit '
43214e0c19c13acbf1ecd714167abf03283d54ef':
Fix error when using list as actionBarNavMode. [DO NOT MERGE]
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Deepanshu Gupta [Thu, 25 Sep 2014 22:42:15 +0000 (15:42 -0700)]
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
Joe Fernandez [Wed, 24 Sep 2014 15:56:02 +0000 (15:56 +0000)]
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
Joe Fernandez [Wed, 24 Sep 2014 15:44:50 +0000 (15:44 +0000)]
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
Joe Fernandez [Wed, 24 Sep 2014 15:39:01 +0000 (15:39 +0000)]
Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
Joe Fernandez [Fri, 19 Sep 2014 17:11:34 +0000 (10:11 -0700)]
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:47 +0000 (17:26 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:42 +0000 (17:26 +0000)]
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()
Jeff Vander Stoep [Tue, 23 Sep 2014 17:12:38 +0000 (17:12 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 17:11:58 +0000 (17:11 +0000)]
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()
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:13 +0000 (17:02 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:04 +0000 (17:02 +0000)]
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()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:16 +0000 (16:50 +0000)]
am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1c2eaa784b2376b674cf438f42342271c8aa79a8':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:34:53 +0000 (16:34 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:24:36 +0000 (16:24 +0000)]
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
Jeff Vander Stoep [Tue, 23 Sep 2014 16:13:41 +0000 (16:13 +0000)]
Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
Jeff Vander Stoep [Mon, 22 Sep 2014 22:15:58 +0000 (15:15 -0700)]
Sanity-check paths of files to be restored
(cherry picked from commit
7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug:
16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
Ricardo Cervera [Mon, 22 Sep 2014 21:44:13 +0000 (21:44 +0000)]
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
Ricardo Cervera [Mon, 22 Sep 2014 21:37:06 +0000 (21:37 +0000)]
am
556f23aa: Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
* commit '
556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
docs: Fixed Developer Tools image. Bug:
17609483
Ricardo Cervera [Mon, 22 Sep 2014 21:26:34 +0000 (21:26 +0000)]
Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
David Friedman [Mon, 22 Sep 2014 20:51:29 +0000 (20:51 +0000)]
am
6bacce4f: am
8dcf1c32: Fixes two typos, one in each file.
* commit '
6bacce4f24ca05fc95c38ea1e7df75dd176b81c2':
Fixes two typos, one in each file.
David Friedman [Mon, 22 Sep 2014 20:41:17 +0000 (20:41 +0000)]
am
8dcf1c32: Fixes two typos, one in each file.
* commit '
8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
Fixes two typos, one in each file.
Ricardo Cervera [Mon, 22 Sep 2014 19:55:43 +0000 (12:55 -0700)]
docs: Fixed Developer Tools image. Bug:
17609483
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
David Friedman [Fri, 19 Sep 2014 01:24:49 +0000 (18:24 -0700)]
Fixes two typos, one in each file.
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
OSDN Git Service
