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

121673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raph Levien
07bed4921a am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'e4ee0e3193f8e66cabc5352046969041ad4921e5':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:18:08 +00:00
Michael Kolb
0fc5f86950 am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask
 2014-04-24 16:13:41 +00:00
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask 
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
 2014-04-24 09:01:19 -07:00
Baligh Uddin
d0af9589ff am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'aed314e8f3e53627518222777c2fe89666bfd643':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:02 +00:00
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +00:00
Craig Mautner
7e28afd956 am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
  Force ActivityView activities to start in new task
 2014-04-24 09:11:30 +00:00
Elliott Hughes
56cc5ba79b am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion." 
* commit '8d47f23e43760dcbf051aaeffff668c3c6340276':
  Fix a typo in an assertion.
 2014-04-24 09:01:44 +00:00
Craig Mautner
7d2d2272f1 Merge "Force ActivityView activities to start in new task" into klp-modular-dev 2014-04-24 04:28:28 +00:00
Deepanshu Gupta
8f9d92c4ca am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7406e4b8102ffd71affd55a9f453c0ecce13a097':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:36:22 +00:00
Deepanshu Gupta
057dca97d9 am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '1668ae8d2a29b491c3ae421c5b0eca101fb10824':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:36:18 +00:00
Deepanshu Gupta
5dee1a093a am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit 'e17ed922001cf70c48969eb7b10ee2e2557b41f9':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:36:14 +00:00
Deepanshu Gupta
7406e4b810 am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7947ec715d8b4a0c82135553abb4947b61bf802b':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:31:24 +00:00
Deepanshu Gupta
1668ae8d2a am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit 'a019e77252f86962b9803042c01b897f7f1aa89f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:31:20 +00:00
Deepanshu Gupta
e17ed92200 am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:31:15 +00:00
Deepanshu Gupta
7947ec715d am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit 'b64732d977c023423cd01d32361a49401d9203cd':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:27:53 +00:00
Deepanshu Gupta
a019e77252 am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '6aaea1bd4aa056335776098cd9dc523e898716f1':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:27:50 +00:00
Deepanshu Gupta
126f4057a0 am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:27:45 +00:00
Deepanshu Gupta
b64732d977 Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:55 +00:00
Deepanshu Gupta
6aaea1bd4a Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:46 +00:00
Deepanshu Gupta
1ea1b21acd Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
 2014-04-23 18:04:26 -07:00
Deepanshu Gupta
5ba2f230fa Add view cookies for action bar menus. [DO NOT MERGE] 
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)
 2014-04-23 18:04:21 -07:00
Elliott Hughes
8d47f23e43 am dbb0de21: Merge "Fix a typo in an assertion." 
* commit 'dbb0de21d35343504b096ae6cbf97d122ac410c9':
  Fix a typo in an assertion.
 2014-04-24 00:25:01 +00:00
Elliott Hughes
dbb0de21d3 Merge "Fix a typo in an assertion." 2014-04-23 23:55:33 +00:00
Elliott Hughes
6bd762289b Fix a typo in an assertion. 
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
 2014-04-23 16:54:33 -07:00
Raph Levien
936df68016 Fix bug 14276128 Clipping at bottom of TextView 
Avoid applying "extra" linespacing to the last line of a layout, because
when that is negative, it causes clipping.

Change-Id: I4cc8792fd3444e4118604cc3d0f816d59dfc1e74
 2014-04-23 23:17:12 +00:00
Deepanshu Gupta
6f9baea477 Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
 2014-04-23 16:11:57 -07:00
Craig Mautner
7f7bdb2712 Force ActivityView activities to start in new task 
Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
 2014-04-23 13:55:36 -07:00
Baligh Uddin
b43b108355 Import translations. DO NOT MERGE 
Change-Id: I99c697cc9974820312756fa89f51e3cf821401e2
Auto-generated-cl: translation import
 2014-04-23 11:27:35 -07:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
 2014-04-23 16:48:34 +00:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
 2014-04-23 16:45:15 +00:00
Neil Fuller
683cf1bffe Merge "Changes to support asynchronous close interruption" 2014-04-23 16:41:17 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption 
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
 2014-04-23 16:40:35 +00:00
Andrew Solovay
e4593554dd am 32117212: am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '32117212fc48872b557044ff25ba6b8d9ace5738':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:51:48 +00:00
Andrew Solovay
32117212fc am 6c5bfa2f: am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '6c5bfa2f348f1d55cbff5f8f2bd61e88ac2d01ee':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:47:50 +00:00
Andrew Solovay
6c5bfa2f34 am 026c82b1: Doc: Fixed a code sample to use standard methods. Also some formatting tweaks. 
* commit '026c82b1916a9e2b48b9ff62ffeb935d63935a68':
  Doc: Fixed a code sample to use standard methods. Also some formatting tweaks.
 2014-04-23 02:44:06 +00:00
Andrew Solovay
026c82b191 Doc: Fixed a code sample to use standard methods. Also some formatting 
tweaks.

Added blank lines for readability, and broke some long lines
so code samples don't need a scroll bar.

(Update: Fixed indentation that I broke on a code sample.)

Bug: 14045051
Change-Id: I1cf08b899ec55f9093545e71861c84120e4b56a1
 2014-04-22 19:29:07 -07:00
Baligh Uddin
128f5efa76 am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '89ed56fa6c5951e4ce7ea555ae8f90c65b2daa2d':
  Import translations. DO NOT MERGE
 2014-04-23 02:13:29 +00:00
Baligh Uddin
97f9607fcc am d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd14bb3cfb95e5bebb181ec9ed08295f25b87a94f':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:22 +00:00
Baligh Uddin
b38d00d579 am abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'abd2a4a44923c28111bdf9ccb59e5557f0deafeb':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:19 +00:00
Baligh Uddin
c1c6de3f91 am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:13 +00:00
Baligh Uddin
6c8e9296c3 am 13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '13c48fba164a977bbf4ef64434427bab297421bf':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:10 +00:00
Baligh Uddin
e22700ac5b am 611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:07 +00:00
Baligh Uddin
9ee5df4b12 am 4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '4516c695b2d8fdbc7dc0427a98841805e47f1e16':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:04 +00:00
Baligh Uddin
0d0bbe4e12 am 2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2d45d4de489563907aebe8bb29c3b965749fe81e':
  Import translations. DO NOT MERGE
 2014-04-23 02:08:00 +00:00
Baligh Uddin
c72133a485 am 5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '5eb7136de95111983bef2357e2543730f66cde03':
  Import translations. DO NOT MERGE
 2014-04-23 02:07:57 +00:00
Baligh Uddin
ed8c409619 am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
  Import translations. DO NOT MERGE
 2014-04-23 02:07:54 +00:00
Baligh Uddin
89ed56fa6c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:07:52 +00:00
Baligh Uddin
44cbb9f229 am 2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
  Import translations. DO NOT MERGE
 2014-04-23 02:07:51 +00:00