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

125193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Lau
40b0d4d751 Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Alan Lau
97170e0c48 Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 2014-07-27 22:35:46 +00:00
Anish Athalye
0c87dfd25d DO NOT MERGE Implement line breaking using ICU break iterator 
Change-Id: I4ad98757aa2eab5dbc2ae44c0391e900ef20c4d0
(cherry picked from commit f8133ae5896926aaf70f12bc0dd1f36a6704c0f5)
 2014-07-28 18:48:01 +00:00
Joe Fernandez
69ed58aced Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 2014-07-25 23:00:08 +00:00
Joe Fernandez
62aab1eaa7 docs: Adding TIF one-pager to TV docs in L-Preview 
Change-Id: I89960cb9c2c8af0ccb010b91ee42d6cffab42f95
 2014-07-31 11:04:00 -07:00
Filip Gruszczynski
6393196f5d Fix double chin issue, where bottom inset is applied twice. 
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.

Bug: 16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
 2014-07-25 14:25:16 -07:00
Robert Ly
9613b433f4 Merge "docs: fix typo" into klp-modular-docs 2014-07-25 21:16:23 +00:00
Ricardo Cervera
6c555824eb docs: Describe the alloc tracker in Android Studio 
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
 2014-07-25 08:32:15 -07:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev 
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
 2014-07-25 02:19:53 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately 
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
 2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev 
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
 2014-07-24 18:06:03 +00:00
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
0f1e067a28 am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '472e234d807df490124263c1e28c66e1918787c9':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-23 23:12:15 +00: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
39572996f2 am 1903bbb8: am 22bdcd2f: Merge "cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1" into klp-modular-docs 
* commit '1903bbb88d8e2e1921b0441911cb73966d3bca4a':
  cherrypick from klp-docs docs: formatting for html Change-Id: I1451615c09cc003a03d7585176036c4d695408f1
 2014-07-23 21:06:47 +00:00
Scott Rowe
162493b5e3 am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '3bb44fecbb9643e68a52d19b9c90809c77367b3e':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-23 21:06:36 +00: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
c12d7e3a3d am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:53:20 +00:00
David Friedman
42dbe80914 am af001f94: 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 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +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
6b2f3ee3b9 am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:08:02 +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
0ff1ecd1ec am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
  DO NOT MERGE
 2014-07-22 19:08:45 +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
3a14c2890e am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:47:26 +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
47495df6a6 am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit 'fb8e254a1a66fc707a1c52d4cced699339f15685':
  docs: update links and add new wear design materials
 2014-07-22 17:18:52 +00:00
Robert Ly
817a31afa3 am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc 
* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
  docs: remove android translation plugin doc
 2014-07-22 17:18:47 +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
d74d7397ef am 43f783fd: (-s ours) Import translations. DO NOT MERGE 
* commit '43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
  Import translations. DO NOT MERGE
 2014-07-22 16:48: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
Justin Koh
e959e4a017 am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
  Revert "Wait for all windows to draw before turning screen on"
 2014-07-22 16:31:06 +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
Robert Ly
c8551e678b am 4f67e66e: am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit '4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
  docs: fix speech code for bug 16461337
 2014-07-22 14:34:06 +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
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