Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,495 Commits 3 Branches 0 Tags
aed314e8f3e53627518222777c2fe89666bfd643
Commit Graph

120495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +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
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 fbfeb1a90b)
 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 1001961f90)
 2014-04-23 18:04:21 -07: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 4a0f93bd32)
 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
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
89ed56fa6c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:07:52 +00:00
Baligh Uddin
d14bb3cfb9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:10 +00:00
Baligh Uddin
abd2a4a449 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:06 +00:00
Baligh Uddin
c2c527a6f4 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
13c48fba16 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
611dd7b70a Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:01:03 +00:00
Baligh Uddin
4516c695b2 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:57 +00:00
Baligh Uddin
2d45d4de48 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:57 +00:00
Baligh Uddin
5eb7136de9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
71b82aedca Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:55 +00:00
Baligh Uddin
2d6e077d1d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:48 +00:00
Baligh Uddin
42c0488a4b Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:44 +00:00
Baligh Uddin
9dbd2eebf9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-23 02:00:41 +00:00
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior. 
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
 2014-04-22 18:07:24 -07:00
Baligh Uddin
cf361e2670 Import translations. DO NOT MERGE 
Change-Id: Ieceadfdafb3e1353a30494c8a9731efcf91b9e8b
Auto-generated-cl: translation import
 2014-04-22 17:54:46 -07:00
Baligh Uddin
2e9dc0e241 Import translations. DO NOT MERGE 
Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import
 2014-04-22 17:12:07 -07:00
Baligh Uddin
c0be1c09ca Import translations. DO NOT MERGE 
Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import
 2014-04-22 17:11:22 -07:00
Ying Wang
d0dc898119 Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev 2014-04-23 00:10:01 +00:00
Baligh Uddin
3870b9dd83 Import translations. DO NOT MERGE 
Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import
 2014-04-22 17:09:18 -07:00
Baligh Uddin
1fa38d2165 Import translations. DO NOT MERGE 
Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import
 2014-04-22 17:08:37 -07:00
Baligh Uddin
8e54756f90 Import translations. DO NOT MERGE 
Change-Id: I236254c3ae3302004f19821a7d7022ae49f6e908
Auto-generated-cl: translation import
 2014-04-22 17:05:01 -07:00
Baligh Uddin
bd41f66b90 Import translations. DO NOT MERGE 
Change-Id: Ia514ffa26785292a7659a5e3950cc3125d50736e
Auto-generated-cl: translation import
 2014-04-22 17:04:17 -07:00
Baligh Uddin
9daf4ae467 Import translations. DO NOT MERGE 
Change-Id: I5867f9bda8854f34ee138c135c46219d36e9be49
Auto-generated-cl: translation import
 2014-04-22 17:03:26 -07:00
Baligh Uddin
e5a1728e2f Import translations. DO NOT MERGE 
Change-Id: Ib7d1feda99c656bcea0c0efc41e9f04bda7049b9
Auto-generated-cl: translation import
 2014-04-22 16:39:03 -07:00
Baligh Uddin
368a984e1b Import translations. DO NOT MERGE 
Change-Id: I6ac555548303cd6b32be846c0479bbe78a977c3a
Auto-generated-cl: translation import
 2014-04-22 16:37:07 -07:00
Baligh Uddin
f80cf264de Import translations. DO NOT MERGE 
Change-Id: Iae11d6890917425aa6c6269d46372f4e6d6c08a2
Auto-generated-cl: translation import
 2014-04-22 16:36:32 -07:00
Baligh Uddin
0ee991bc0d Import translations. DO NOT MERGE 
Change-Id: I757cae4af2ba6dfac51383bf48f17708e44adf6f
Auto-generated-cl: translation import
 2014-04-22 16:35:44 -07:00
Baligh Uddin
78448af37f Import translations. DO NOT MERGE 
Change-Id: Idc8ada2c34c0846b4ad8c3094e78d6beff2cc38e
Auto-generated-cl: translation import
 2014-04-22 16:35:06 -07:00
Victoria Lease
df64ac688d ask skia to use flat gamma when rendering fonts from hwui 
Bug: 13748392
Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78
(cherry picked from commit b66270eac2)
 2014-04-22 22:54:10 +00:00
Ying Wang
b081a59a0f Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name 
It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
 2014-04-22 15:20:16 -07:00
Justin Koh
3b9a3cc02e Update GlobalActions for watches. 
Update GlobalActions for watches: only have power off and settings, due to
limited real estate.

Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
 2014-04-22 10:01:47 -07:00