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

122420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prashant Malani
b4dcc64fe6 Merge "Revert "Remove circular mask"" into klp-modular-dev 2014-07-24 15:36:14 +00:00
Prashant Malani
a04ea61db5 Revert "Remove circular mask" 
This reverts commit 2e8b27e898af3af1165a79e7c5f8b59f63f20a2f.

It also makes the circularMask option configurable via overlay.
It is set to false by default.

An offset dimension entry is also provided, for displays which have
a "chin". This is set to 0 by default.

Bug: 16380982
Change-Id: I16ec3e8d8882a6683c9155055944e5c2f5cd781e
 2014-07-23 17:26:08 -07:00
Ricardo Cervera
472e234d80 am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '7af4e812d06d7174e9eb677a508c6af0f3ba3608':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-23 23:08:10 +00:00
Ricardo Cervera
7af4e812d0 docs: Fixed RecyclerView example. Bug: 16483811 
Change-Id: I1c501c97026dfaaac88d7398160ff192fee4fb05
 2014-07-23 15:56:10 -07:00
Robert Ly
1903bbb88d am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '22bdcd2f829dd9226978c9ec4405fd89d4562d73':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:02:12 +00:00
Scott Rowe
3bb44fecbb am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '72c80d308a88d59347f13dd813f2885bc4f45acc':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-23 21:02:09 +00:00
Scott Rowe
72c80d308a cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
Change-Id: I245d8351d82b29131783df71f78fcd7bc3c1d89e
 2014-07-23 20:49:45 +00:00
Robert Ly
22bdcd2f82 Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 2014-07-23 18:44:51 +00:00
Scott Rowe
e2bdaea318 cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1 
Change-Id: I21424c1407b44554ac135248dabc2328bc70aef9
 2014-07-23 20:54:50 +00:00
Robert Ly
ff428e08a5 am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:49:05 +00:00
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00
Scott Rowe
2a922cb45a am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:03:19 +00:00
Andrew Solovay
3968ae0f70 am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
  DO NOT MERGE
 2014-07-22 19:02:58 +00:00
Andrew Solovay
a2beba70b9 am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:41:21 +00:00
Robert Ly
fb8e254a1a am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
  docs: update links and add new wear design materials
 2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179 am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
  docs: remove android translation plugin doc
 2014-07-22 17:12:10 +00:00
Robert Ly
0b5f9c2f68 docs: remove android translation plugin doc 
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
 2014-07-22 17:07:12 +00:00
Baligh Uddin
43f783fd7e Import translations. DO NOT MERGE 
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
 2014-07-22 16:39:39 +00:00
Robert Ly
1c723ea84e Merge "docs: update links and add new wear design materials" into klp-modular-docs 2014-07-22 16:21:19 +00:00
Robert Ly
faaf23b9ac docs: update links and add new wear design materials 
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
 2014-07-22 10:06:31 -07:00
Robert Ly
c57c082983 Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 2014-07-22 16:13:36 +00:00
Dirk Dougherty
b2902ee380 Doc change: add reminder for developers on using ad id. 
Change-Id: I6de92d091c469a4e81ec29c95ce65204f708fd97
 2014-07-22 20:41:57 +00:00
David Friedman
170b09535d Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 2014-07-22 16:13:36 +00:00
David Friedman
86efa014fc Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body. 
Change-Id: I8d9077793dbe1dd345afd7152328018d818b07ce
 2014-07-22 00:22:00 -07:00
Ricardo Cervera
940ae93043 Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e docs: Added note suggesting use of Android Studio over ADT 
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
 2014-07-21 09:08:10 -07:00
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -07:00
Robert Ly
f3be7864a6 Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 2014-07-21 15:42:19 +00:00
Robert Ly
61ecfc3428 docs: fix speech code for bug 16461337 
Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
 2014-07-22 14:25:10 +00:00
Andrew Solovay
eb69126c61 Merge "DO NOT MERGE" into klp-modular-docs 2014-07-18 22:16:50 +00:00
Andrew Solovay
8e4ff7fee7 DO NOT MERGE 
cherrypick from klp-modular-dev docs: Noted how singleTop affects "up" navigation. Change-Id: 4d06d970526b58ddaf8db89858615217fa88772b

Docs are staged to:

http://asolovay.mtv:9411/training/implementing-navigation/ancestral.html#NavigateUp
http://asolovay.mtv:9411/guide/topics/manifest/activity-element.html#lmode

bug: 14527411
Change-Id: Ia414f2206339fc33739c8244f14140dd2e5d1607
(cherry picked from commit 4d06d970526b58ddaf8db89858615217fa88772b)
 2014-07-22 18:16:39 +00:00
Andrew Solovay
170556f82b Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 2014-07-18 22:16:50 +00:00
Andrew Solovay
1eaab8ff83 docs: Removed reference to a sample notepad app. 
The first section incorrectly said that there was a full Notepad
sample app in the "samples" directory; removed that reference.

Also changed the description in "Other Resources and Further Learning"
to point to the sample in "samples/legacy/NotePad".

Doc is staged to: http://asolovay.mtv:9249/training/notepad/

bug: 15612249
Change-Id: I6c17565fd7708fb50915e8cdd73043964cc2878a
 2014-07-21 12:38:05 -07:00
Justin Koh
a63272b4b5 Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 2014-07-17 21:09:48 +00:00
Robert Ly
4f67e66e3e am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit 'f3be7864a6cf1b98107de1eadf25587b53a90fca':
  docs: fix speech code for bug 16461337
 2014-07-22 14:30:13 +00:00
Justin Koh
528b4b7572 Revert "Wait for all windows to draw before turning screen on" 
This reverts commit 0a589b929e18d05d1345d97283c3025058ddca18.

Change-Id: Ia73555cd7797b5d172f33db9f46ebc211af6fc1e
 2014-07-22 00:26:23 +00:00
Deepanshu Gupta
9a61270d67 Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev 2014-07-19 22:40:06 +00:00
Deepanshu Gupta
f5fbff9b1a LayoutLib: Fix EditText rendering [DO NOT MERGE] 
Framework has overloaded java.lang.System.arraycopy() for char[]. The
method is not present on the Desktop VMs. This change replaces the calls
to this method by its more general alternative - the one using Objects.

TODO: Make it more configurable and flexible to allow rewrite of any
such methods in the future.

Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
(cherry picked from commit fc3e93300733b4a161adb9cceebea6cda353d085)
 2014-07-21 17:38:00 -07:00
Deepanshu Gupta
c54100d449 Update layoutlib create README [DO NOT MERGE] 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
 2014-07-21 17:37:20 -07:00
Deepanshu Gupta
0ca0853c52 Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 2014-07-21 15:43:35 +00:00
Dirk Dougherty
d1929c505a am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id. 
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
 2014-07-21 22:15:04 +00:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
Ricardo Cervera
d73eb7f9c9 am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:07:00 +00:00
Robert Ly
efca30d0fa am 62c81ab5: docs: change copy for edu video 
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video
 2014-07-21 16:11:39 +00:00
David Friedman
0d5af3f67b am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 07:59:05 +00:00
Quddus Chong
f0804df142 am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:04:21 +00:00
Deepanshu Gupta
f498991062 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]
 2014-07-18 22:35:37 +00:00
Deepanshu Gupta
d32dd2948d 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]
 2014-07-18 22:31:17 +00:00
Deepanshu Gupta
b86675f14b 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]
 2014-07-18 22:26:45 +00:00