OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 62c81ab5: docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:11:39 +0000 (16:11 +0000)]
am 62c81ab5: docs: change copy for edu video

* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video

10 years agodocs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:06:50 +0000 (09:06 -0700)]
docs: change copy for edu video

Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d

10 years agoam 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into...
David Friedman [Sun, 20 Jul 2014 07:59:05 +0000 (07:59 +0000)]
am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.

10 years agoam 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
Quddus Chong [Fri, 18 Jul 2014 23:04:21 +0000 (23:04 +0000)]
am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

10 years agoam d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c735197...
Deepanshu Gupta [Fri, 18 Jul 2014 22:35:37 +0000 (22:35 +0000)]
am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'd32dd2948d95a01e6b581ffbc357cf759bae0242':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:31:17 +0000 (22:31 +0000)]
am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66...
Deepanshu Gupta [Fri, 18 Jul 2014 22:26:45 +0000 (22:26 +0000)]
am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff2...
Deepanshu Gupta [Fri, 18 Jul 2014 22:22:24 +0000 (22:22 +0000)]
am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'b9efa1e5a11d1542d0bab9c945ce1e920b819764':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agodocs: Fixed bugs in Game Controller training doc.
Quddus Chong [Fri, 18 Jul 2014 21:38:38 +0000 (14:38 -0700)]
docs: Fixed bugs in Game Controller training doc.
bug: 1637524714671463

Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a

10 years agoam 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e8...
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '14a4e69cc656b60c705d2f05229aed2a7049693c':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b...
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:10 +0000 (22:12 +0000)]
am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '3f51ab0d81b3f24a0246f3bfe28ea5b364b48210':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab8...
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'c735197420948ffff757dbe6d00028a87ed09c15':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am...
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'a3966c66ee24109ca4b71f591f0d740ee37987de':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:31 +0000 (22:07 +0000)]
am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '3c92b93226195523ff857763901a33847165ee9e':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4d...
Deepanshu Gupta [Fri, 18 Jul 2014 22:06:44 +0000 (22:06 +0000)]
am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c35afdfd4c40e55e235791341c515bd012d77146':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:28 +0000 (22:02 +0000)]
am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '7f98066dd1a2a05d53ba39108dd4d44430e89c71':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:14 +0000 (22:02 +0000)]
am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '62b81acbcad6ceaa269c7f788068bdf32f403040':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:07 +0000 (22:02 +0000)]
am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'cee55fc19bc9542d17081568ba082b56b5e5d04d':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix...
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution...
Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]
am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolu...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:44 +0000 (21:57 +0000)]
am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01f...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:16 +0000 (21:57 +0000)]
am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '2df48bed6afed4958835b8bdc2c8b44db32919fc':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:01 +0000 (21:57 +0000)]
am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '99286edc3ef164d0d247a86cc58c391e5854aa70':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles...
Deepanshu Gupta [Fri, 18 Jul 2014 21:55:21 +0000 (21:55 +0000)]
am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '87234e8544370d86b305fc55d6a5021c38b65495':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix defaul...
Deepanshu Gupta [Fri, 18 Jul 2014 21:54:59 +0000 (21:54 +0000)]
am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'efd29681d8f8df6d23a1e7f307e9300bd8331a2f':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc...
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:15 +0000 (21:53 +0000)]
am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'aa0c1c755c15fec30f005d53bed6091180c4e521':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge...
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:11 +0000 (21:53 +0000)]
am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for...
Deepanshu Gupta [Fri, 18 Jul 2014 21:52:52 +0000 (21:52 +0000)]
am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit 'a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags...
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\...
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix defaul...
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:13 +0000 (21:49 +0000)]
am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'e83fa180a874fb9222ae8e87c0d333411decc0c7':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolu...
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)]
am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:48:05 +0000 (21:48 +0000)]
am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:28 +0000 (21:45 +0000)]
am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:20 +0000 (21:45 +0000)]
am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with...
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:19 +0000 (21:45 +0000)]
am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi...
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:52 +0000 (21:44 +0000)]
am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags...
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:11 +0000 (21:44 +0000)]
am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:42:10 +0000 (21:42 +0000)]
am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:41:18 +0000 (21:41 +0000)]
am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:42 +0000 (21:39 +0000)]
am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:35 +0000 (21:39 +0000)]
am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:33 +0000 (21:39 +0000)]
am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:25 +0000 (21:39 +0000)]
am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:38:39 +0000 (21:38 +0000)]
am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:36:29 +0000 (21:36 +0000)]
am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:35:21 +0000 (21:35 +0000)]
am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:32:52 +0000 (21:32 +0000)]
am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:33 +0000 (21:31 +0000)]
am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:26 +0000 (21:31 +0000)]
am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:28 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:40 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:46 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev

10 years agoMerge "add command to enable bt snoop log" into klp-modular-dev
Guang Zhu [Fri, 18 Jul 2014 03:28:10 +0000 (03:28 +0000)]
Merge "add command to enable bt snoop log" into klp-modular-dev

10 years agoadd command to enable bt snoop log
Guang Zhu [Fri, 18 Jul 2014 03:24:56 +0000 (20:24 -0700)]
add command to enable bt snoop log

Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2

10 years agoam 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular...
Ricardo Cervera [Thu, 17 Jul 2014 20:31:01 +0000 (20:31 +0000)]
am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular...
Robert Ly [Thu, 17 Jul 2014 20:27:03 +0000 (20:27 +0000)]
am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoMerge "Make the booting flag update unconditional" into klp-modular-dev
Prashant Malani [Thu, 17 Jul 2014 19:52:27 +0000 (19:52 +0000)]
Merge "Make the booting flag update unconditional" into klp-modular-dev

10 years agoMerge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
Robert Ly [Thu, 17 Jul 2014 20:23:20 +0000 (20:23 +0000)]
Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

10 years agoMerge "Only use bottom outset for main display." into klp-modular-dev
Filip Gruszczynski [Thu, 17 Jul 2014 19:52:25 +0000 (19:52 +0000)]
Merge "Only use bottom outset for main display." into klp-modular-dev

10 years agoOnly use bottom outset for main display.
Filip Gruszczynski [Wed, 16 Jul 2014 23:35:18 +0000 (16:35 -0700)]
Only use bottom outset for main display.

Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee

10 years agoMerge "Minor typos, consistency things, one grammatical error." into klp-modular...
David Friedman [Sun, 20 Jul 2014 07:55:17 +0000 (07:55 +0000)]
Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

10 years agoMinor typos, consistency things, one grammatical error.
David Friedman [Fri, 18 Jul 2014 09:28:54 +0000 (02:28 -0700)]
Minor typos, consistency things, one grammatical error.

Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c

10 years agoam e287cf33: docs: Update ADT-1 page with supported apps
Joe Fernandez [Thu, 17 Jul 2014 16:44:19 +0000 (16:44 +0000)]
am e287cf33: docs: Update ADT-1 page with supported apps

* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps

10 years agoMerge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
Ricardo Cervera [Thu, 17 Jul 2014 20:25:34 +0000 (20:25 +0000)]
Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

10 years agodocs: Update ADT-1 page with supported apps
Joe Fernandez [Wed, 16 Jul 2014 23:22:51 +0000 (16:22 -0700)]
docs: Update ADT-1 page with supported apps

Change-Id: I7281767e3a51ce518f4e14f0751ba71859e16d24

10 years agoMerge "Additional cleanup after stack deletion." into klp-modular-dev
Justin Koh [Thu, 17 Jul 2014 00:57:51 +0000 (00:57 +0000)]
Merge "Additional cleanup after stack deletion." into klp-modular-dev

10 years agoMerge "Wait for all windows to draw before turning screen on" into klp-modular-dev
Justin Koh [Thu, 17 Jul 2014 00:43:18 +0000 (00:43 +0000)]
Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev

10 years agoWait for all windows to draw before turning screen on
Craig Mautner [Wed, 16 Jul 2014 23:07:26 +0000 (16:07 -0700)]
Wait for all windows to draw before turning screen on

Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d

10 years agoMerge "Using outset bottom from theme as bottom inset on circular screens." into...
Filip Gruszczynski [Thu, 17 Jul 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

10 years agoUsing outset bottom from theme as bottom inset on circular screens.
Filip Gruszczynski [Tue, 15 Jul 2014 00:10:42 +0000 (17:10 -0700)]
Using outset bottom from theme as bottom inset on circular screens.

Change-Id: I46374b345e60a74b6afbbb6a278a0b8e81650681

10 years agoAdditional cleanup after stack deletion.
Craig Mautner [Wed, 16 Jul 2014 21:56:05 +0000 (14:56 -0700)]
Additional cleanup after stack deletion.

- Remove activity from PendingActivityLaunch list when it is removed
from stack. This prevents the delayed launch causing
IllegalArgumentException in b/16045752.
- Move PendingActivityLaunch from ActivityManagerService to
ActivityStackSupervisor.
- Immediately call onTaskListEmptyLocked() in cases where no
activities are found in stack.

Fixes bug 16045752.

Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4

10 years agoam fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs
kmccormick [Wed, 16 Jul 2014 21:17:15 +0000 (21:17 +0000)]
am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs

* commit 'fc8a3b5f06fe725ed561fb3535efd02b16c526ea':
  Doc Update: new Smack sample.

10 years agoam 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space...
David Friedman [Wed, 16 Jul 2014 21:17:12 +0000 (21:17 +0000)]
am 046702ba: A linebreak had somehow wrongly replaced a blank space. Blank space restored.

* commit '046702ba57c34893e058674dc36192796af20da7':
  A linebreak had somehow wrongly replaced a blank space. Blank space restored.

10 years agoA linebreak had somehow wrongly replaced a blank space. Blank space restored.
David Friedman [Wed, 16 Jul 2014 19:33:55 +0000 (12:33 -0700)]
A linebreak had somehow wrongly replaced a blank space. Blank space restored.

Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab
(cherry picked from commit fe545cdb4e9d49d8cf58626ef77709abecf8f26b)

10 years agoA linebreak had somehow wrongly replaced a blank space. Blank space restored.
David Friedman [Wed, 16 Jul 2014 19:33:55 +0000 (12:33 -0700)]
A linebreak had somehow wrongly replaced a blank space. Blank space restored.

Change-Id: Iab27ee6676b53a71538020219aa67c66d45cbfab

10 years agoam 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs
Robert Ly [Wed, 16 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am 82088d62: Merge "docs: add EU legal notice" into klp-modular-docs

* commit '82088d62f81a1d842bdb2d285ed578c562b20edd':
  docs: add EU legal notice

10 years agoam f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs
Quddus Chong [Wed, 16 Jul 2014 18:13:19 +0000 (18:13 +0000)]
am f0d8c6fc: Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs

* commit 'f0d8c6fcae7176fd99e9e10bbe9e494c18860cfd':
  docs: Fixed small typo. bug: 14617866

10 years agoam 7a047941: docs: Fix minor issues with Wear data events docs.
Chris Smith [Wed, 16 Jul 2014 18:09:17 +0000 (18:09 +0000)]
am 7a047941: docs: Fix minor issues with Wear data events docs.

* commit '7a04794186dcb679501a7a9383caae8df01428d0':
  docs: Fix minor issues with Wear data events docs.

10 years agoMerge "Doc Update: new Smack sample." into klp-modular-docs
kmccormick [Wed, 16 Jul 2014 21:02:36 +0000 (21:02 +0000)]
Merge "Doc Update: new Smack sample." into klp-modular-docs

10 years agoMerge "docs: add EU legal notice" into klp-modular-docs
Robert Ly [Wed, 16 Jul 2014 19:19:50 +0000 (19:19 +0000)]
Merge "docs: add EU legal notice" into klp-modular-docs

10 years agodocs: add EU legal notice
Robert Ly [Wed, 16 Jul 2014 19:07:49 +0000 (12:07 -0700)]
docs: add EU legal notice

bug 16345613
Change-Id: I96215d7a55bc52bc69a312ba0bb0e1e83dd82d9e

10 years agoMerge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs
Quddus Chong [Wed, 16 Jul 2014 18:09:08 +0000 (18:09 +0000)]
Merge "docs: Fixed small typo. bug: 14617866" into klp-modular-docs

10 years agodocs: Fixed small typo.
Quddus Chong [Wed, 16 Jul 2014 17:28:16 +0000 (10:28 -0700)]
docs: Fixed small typo.
bug: 14617866

Change-Id: I967be618d805b126a750bb60f8bc26f2dc5a95e9

10 years agodocs: Fix typo in Wear docs. Bug: 16327298
Ricardo Cervera [Wed, 16 Jul 2014 16:02:36 +0000 (09:02 -0700)]
docs: Fix typo in Wear docs. Bug: 16327298

Change-Id: I682b9bba9d01712b98d5de97d31ef2d88b5b6ea0

10 years agodocs: Fix minor issues with Wear data events docs.
Chris Smith [Wed, 16 Jul 2014 12:15:17 +0000 (13:15 +0100)]
docs: Fix minor issues with Wear data events docs.

Change-Id: Id6f6c57748e2e51b7a0de6fb6e7912a0c838d987

10 years agoam 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentF...
Andrew Solovay [Wed, 16 Jul 2014 13:22:57 +0000 (13:22 +0000)]
am 63477e67: Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs

* commit '63477e67eba4e8f3d3c17c3774cd99d23db39456':
  cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38

10 years agoam bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs
Robert Ly [Wed, 16 Jul 2014 13:22:54 +0000 (13:22 +0000)]
am bf42978e: Merge "NDK filesizes and hashes updated" into klp-modular-docs

* commit 'bf42978e14e352984eb5443687fccd5b15dc27a3':
  NDK filesizes and hashes updated

10 years agoam c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView...
Ricardo Cervera [Wed, 16 Jul 2014 13:22:50 +0000 (13:22 +0000)]
am c79f3d69: Merge "cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee" into klp-modular-docs

* commit 'c79f3d696a24ade6017b0e91d92898190c204dd2':
  cherrypick from klp-modular-dev docs: Fix issue with CardView preview docs Bug: 16277161 Change-Id: Iea8cbff81fbf3ac50c9009fbf21dc65c625e71ee

10 years agoam 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs
Robert Ly [Wed, 16 Jul 2014 13:22:47 +0000 (13:22 +0000)]
am 649e8f9b: Merge "docs: add edu video highlights" into klp-modular-docs

* commit '649e8f9b2b9442fc29570f86a2f92fe5b7538c45':
  docs: add edu video highlights

10 years agoam 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into...
Andrew Solovay [Wed, 16 Jul 2014 13:22:44 +0000 (13:22 +0000)]
am 3f8d9c9e: Merge "docs: Replaced deprecated fill_parent with match_parent." into klp-modular-docs

* commit '3f8d9c9e0a67a87009ee42904d3f08fe2f1371c6':
  docs: Replaced deprecated fill_parent with match_parent.

10 years agoam 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551
Quddus Chong [Wed, 16 Jul 2014 13:22:44 +0000 (13:22 +0000)]
am 6a5dd936: docs: Fixed typo in L Preview API Overview. bug: 15696551

* commit '6a5dd93652ffce88891c2bd2dc7a19c764075631':
  docs: Fixed typo in L Preview API Overview. bug: 15696551

10 years agoam de138276: docs: Fix typos in the L preview docs. Bug: 16240486
Ricardo Cervera [Wed, 16 Jul 2014 13:22:43 +0000 (13:22 +0000)]
am de138276: docs: Fix typos in the L preview docs. Bug: 16240486

* commit 'de138276f1c0a02f91e32f889639c629d883f948':
  docs: Fix typos in the L preview docs. Bug: 16240486

10 years agoam 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.
David Friedman [Wed, 16 Jul 2014 13:22:43 +0000 (13:22 +0000)]
am 7f6af88e: Fixed a randomly discovered typo and missing hyphen. Change not staged.

* commit '7f6af88e9460b788f68e956c9b104bc68fcfc8c4':
  Fixed a randomly discovered typo and missing hyphen. Change not staged.

10 years agodocs: Fixed RecyclerView example. Bug: 15973665
Ricardo Cervera [Wed, 16 Jul 2014 00:01:09 +0000 (17:01 -0700)]
docs: Fixed RecyclerView example. Bug: 15973665

Change-Id: Ia3c2264d014c8d2e67b2ee96d097be110042c56f

10 years agoMake the booting flag update unconditional
Prashant Malani [Tue, 15 Jul 2014 23:28:24 +0000 (16:28 -0700)]
Make the booting flag update unconditional

In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560

10 years agoMerge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into...
Ricardo Cervera [Tue, 15 Jul 2014 21:01:33 +0000 (21:01 +0000)]
Merge "docs: Added note on disabling debugging for WebView apps. Bug: 16232761" into klp-modular-dev

10 years agoDoc Update: new Smack sample.
kmccormick [Mon, 14 Jul 2014 21:23:50 +0000 (14:23 -0700)]
Doc Update: new Smack sample.

Change-Id: I4395d13eab5e7801dae85394350536ae6cb38e9e

10 years agodocs: Added note on disabling debugging for WebView apps. Bug: 16232761
Ricardo Cervera [Fri, 11 Jul 2014 17:12:48 +0000 (10:12 -0700)]
docs: Added note on disabling debugging for WebView apps. Bug: 16232761

Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365

10 years agoMerge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage...
Andrew Solovay [Tue, 15 Jul 2014 22:13:45 +0000 (22:13 +0000)]
Merge "cherrypick from klp-docs docs: Corrected doc for getLaunchIntentForPackage(). Change-Id: I2eab0956eaedac71289e19a3618a3553908f8c38" into klp-modular-docs