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

125120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
9c53194a6f am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189
 2014-07-29 16:34:01 +00:00
Robert Ly
58967bfbe8 am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189
 2014-07-29 16:30:07 +00:00
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Robert Ly
1c977b3744 Merge "docs: fix typo bug 16623189" into klp-modular-docs 2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde docs: fix typo bug 16623189 
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
 2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Craig Mautner
0fa45d93f7 Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 2014-07-28 22:45:16 +00:00
Craig Mautner
7f13ed37fd Remove PendingActivityLaunches based on stack. 
Was previously removing by trying to match activities, but the
activity being matched would not have been in the stack yet. Since
it doesn't get added to the stack when it goes into the list
of pending activities. By removing all pending activities associated
with the stack we clean up all such pending activities.

Fixes bug 16045752.

Change-Id: I6b5981ffcce674139837b06362e573299bbc9e52
 2014-07-28 14:00:35 -07:00
Alan Lau
52baf3d096 am 77d6f36b: Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
* commit '77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f':
  Revert "DO NOT MERGE Implement line breaking using ICU break iterator"
 2014-07-28 20:07:23 +00:00
Alan Lau
d2e1ecb67b am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev 
* commit '40b0d4d7519b6a1999742534513406f94c169f1f':
  Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"
 2014-07-28 19:58:00 +00:00
Alan Lau
18b5f44c5e am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying" 
* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"
 2014-07-28 19:57:55 +00:00
Alan Lau
77d6f36bbc Revert "DO NOT MERGE Implement line breaking using ICU break iterator" 
This reverts commit 0c87dfd25d5a305fb67eb328d114aada87055dd7.

Change-Id: Ibc300bb945776594099b69965cabe7220d10de2f
 2014-07-28 19:53:51 +00:00
Anish Athalye
a665380b60 am 1a408a34: DO NOT MERGE Fix extraneous allocation and copying 
* commit '1a408a344c7921d7c943826bea3ce0cdd822583d':
  DO NOT MERGE Fix extraneous allocation and copying
 2014-07-28 19:53:26 +00:00
Alan Lau
af60e56b39 Revert "DO NOT MERGE Fix extraneous allocation and copying" 
This reverts commit 1a408a344c7921d7c943826bea3ce0cdd822583d.

Change-Id: If5a19a4cc54e76aeddac0923e28bbf310e78feb4
 2014-07-28 19:51:01 +00:00
Alan Lau
3150372342 am 97170e0c: Merge "DO NOT MERGE Implement line breaking using ICU break iterator" into klp-modular-dev 
* commit '97170e0c48bbff21ef6773110d950621131cf9dd':
  DO NOT MERGE Implement line breaking using ICU break iterator
 2014-07-28 19:10:29 +00:00
Anish Athalye
c51a6e45e8 am a28e4764: DO NOT MERGE Fix line breaking for clusters in narrow views 
* commit 'a28e4764994283c3595dd41f12e425cf7dc0d985':
  DO NOT MERGE Fix line breaking for clusters in narrow views
 2014-07-28 19:10:19 +00:00
Anish Athalye
1a408a344c DO NOT MERGE Fix extraneous allocation and copying 
With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a
(cherry picked from commit 733b3c0f8b77fefcd234c94170faa4e7bd76074c)
 2014-07-28 19:06:10 +00:00
Anish Athalye
a28e476499 DO NOT MERGE Fix line breaking for clusters in narrow views 
Clusters were broken incorrectly when in narrow views (when the width of
the cluster was greater than the width of a view). Also, out() calls
were modifying fm, so clusters that were too wide were not positioned
correctly.

Change-Id: I521f8dc6338f5f1de6858af3f0c0bd320aa46bc0
(cherry picked from commit 162713dd0b72af79c1b2286985f7e79f043cd915)
 2014-07-28 18:47:40 +00:00
Ricardo Cervera
652e5c7ef1 Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 2014-07-28 18:28:56 +00:00
Ricardo Cervera
321e030202 docs: Fix Wear docs issues. 
Bug: 16624918
Bug: 16626217
Bug: 16626415
Bug: 16624384
Bug: 16623147

Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
 2014-07-28 17:52:40 +00:00
Filip Gruszczynski
d0e0339239 Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 2014-07-27 22:35:46 +00:00
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
cbeef01cce Revert "DO NOT MERGE Fix line breaking for clusters in narrow views" 
This reverts commit a28e4764994283c3595dd41f12e425cf7dc0d985.

Change-Id: I73fe7b3e6bdba327e55a58afd36a7f58f49945d0
 2014-07-28 19:52:11 +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
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