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

129095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
d2cc56ebb3 resolved conflicts for merge of f8a58208 to master 
Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
 2014-04-24 10:27:37 -07:00
ztenghui
589e7b40be Format the xml files for the VectorDrawableTest 
All automatically done by the tool.
No real changes.

Change-Id: I8a98be9441d7cb0b3636c2a850d1e7de9e79394f
 2014-04-24 10:13:07 -07:00
Alexandra Gherghina
80021878a8 Merge "Fix two potential NPEs in DeviceInfo" 2014-04-24 17:11:51 +00:00
Alexandra Gherghina
a4fcb44033 Fix two potential NPEs in DeviceInfo 
Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
 2014-04-24 17:55:30 +01:00
ztenghui
7940dc57e3 Shoot the rays to the vertices of the incoming polygon. 
bug:13553955

Change-Id: I4825a49e8eaab969c40f2ee4086f7669c9c6fd29
 2014-04-24 09:53:20 -07:00
Jeff Davidson
ee2a1219d3 API tweaks for network score settings. 
Expose "isAppValidScorer" so Settings can call it.

Also rename ACTION_CHANGE_DEFAULT to ACTION_CHANGE_ACTIVE for
consistency with other naming.

Change-Id: I6c2d0099622958f06c2916ca76090e14d5273c86
 2014-04-24 09:33:27 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev 
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
 2014-04-24 16:33:02 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
79cb5505a9 am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:25:21 +00:00
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
83474f5b4d am 0fc5f869: am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit '0fc5f86950f6089eb8b4cbc0bf9684b8be090fa3':
  Use rotation to position circular display mask
 2014-04-24 16:16:59 +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
Kenny Guy
1c29903198 Merge "Fix bug with getLauncherActivities ignoring packageName." 2014-04-24 15:49:08 +00:00
Baligh Uddin
7cb08dd95e am d0af9589: (-s ours) am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'd0af9589ff8971bb02ee764454e3a46b0c2aebaa':
  Import translations. DO NOT MERGE
 2014-04-24 15:43:59 +00:00
Craig Mautner
6c66d1fd79 am 7e28afd9: am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7e28afd9568c590c7110f83b252dbb77f165fcb3':
  Force ActivityView activities to start in new task
 2014-04-24 15:43:37 +00:00
Elliott Hughes
f4567f0c50 am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion." 
* commit '56cc5ba79bdf75a73281dc73f13169a409d96c28':
  Fix a typo in an assertion.
 2014-04-24 15:43:24 +00:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded 
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
 2014-04-24 08:42:32 -07:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded 
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
 2014-04-24 08:41:29 -07:00
Alexandra Gherghina
e255d7399f Merge "Modify getUserProfiles to return only enabled profiles:" 2014-04-24 15:22:09 +00: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
John Spurlock
10459a5411 Merge "Move notification listener management into helper." 2014-04-24 14:32:41 +00:00
Baligh Uddin
6ec0b32173 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:38 +00:00
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +00:00
Baligh Uddin
0dea3a6eea Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:30 +00:00
Baligh Uddin
b2cb3a2518 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:20 +00:00
Baligh Uddin
781d1ca2c5 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:14 +00:00
Baligh Uddin
9ea712006d Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:12 +00:00
George Mount
19d1381752 Merge "Properly filter out excluded views in createAnimators() call." 2014-04-24 14:12:17 +00:00
Kenny Guy
1a4e0b9980 Fix bug with getLauncherActivities ignoring packageName. 
Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
 2014-04-24 12:28:04 +01: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
Alexandra Gherghina
385124d8ce Modify getUserProfiles to return only enabled profiles: 
Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.

Bug: 13755441
Bug: 13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
 2014-04-24 10:07:51 +01: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
6dd5a1d348 am 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '8f9d92c4ca5233607ca01dac0b3b66fde5539307':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 03:24:18 +00:00
Deepanshu Gupta
36ec9c9581 am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '057dca97d9a486b94c82673a95a7a3933bca9a4d':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 03:24:14 +00:00
Deepanshu Gupta
dba62dc904 am 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5dee1a093abc4d6fd197ba2c3be012c9536ba1c5':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 03:24:10 +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