Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,028 Commits 3 Branches 0 Tags
6af40da8af56df7331d7d9c8b8c030d4c7c56eaa
Commit Graph

38677 Commits

Author SHA1 Message Date
Craig Mautner
6af40da8af am d2cc56eb: resolved conflicts for merge of f8a58208 to master 
* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded
 2014-04-24 17:34:10 +00:00
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
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
Raph Levien
89d94564ec am 79cb5505: am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '79cb5505a97a0465fb849dc20dcaf3dd2f608c9f':
  Fix bug 14276128 Clipping at bottom of TextView
 2014-04-24 16:30:14 +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
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +00: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
94f24069e2 am e255d739: Merge "Modify getUserProfiles to return only enabled profiles:" 
* commit 'e255d7399f46de4b4e3d94b95b26df3408274394':
  Modify getUserProfiles to return only enabled profiles:
 2014-04-24 15:25:58 +00:00
Alexandra Gherghina
e255d7399f Merge "Modify getUserProfiles to return only enabled profiles:" 2014-04-24 15:22:09 +00:00
George Mount
324a60602d am 19d13817: Merge "Properly filter out excluded views in createAnimators() call." 
* commit '19d138175281c56c16df0d395db17593356547ac':
  Properly filter out excluded views in createAnimators() call.
 2014-04-24 14:15:53 +00:00
George Mount
19d1381752 Merge "Properly filter out excluded views in createAnimators() call." 2014-04-24 14:12:17 +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
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
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
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
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
John Reck
57c71834c8 am f4201925: Merge "Add missing try/finallys" 
* commit 'f4201925d9e3d01e7a2a1db07c8186e4ba9a0fb5':
  Add missing try/finallys
 2014-04-24 00:27:22 +00:00
Winson Chung
ea1b9eb488 am 1b244f44: Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)" 
* commit '1b244f44a796484866f13e0639420477c3191695':
  Piping through ability for an Activity to remove its own task. (Bug 13735914)
 2014-04-23 23:53:22 +00:00
John Reck
f4201925d9 Merge "Add missing try/finallys" 2014-04-23 23:34:51 +00: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
Selim Gurun
0e58fb3794 am 25a13518: Merge "Tune down the linkify false positive rate" 
* commit '25a1351831b9912c8316a90444fb3bd1521b5cfc':
  Tune down the linkify false positive rate
 2014-04-23 21:50:09 +00:00
John Reck
05e858400a Add missing try/finallys 
Change-Id: I32be65f5a46768449f26b69f72f502acd1e72769
 2014-04-23 14:48:28 -07:00
Winson Chung
1b244f44a7 Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)" 2014-04-23 21:35:33 +00:00
Selim Gurun
25a1351831 Merge "Tune down the linkify false positive rate" 2014-04-23 21:23:27 +00:00
Winson Chung
3b3f464445 Piping through ability for an Activity to remove its own task. (Bug 13735914) 
Change-Id: Iefcd4fbe68748195de8ee37ee2b6edef55276603
 2014-04-23 13:57:06 -07:00
Martijn Coenen
18b3d0b703 am aa1492d1: Dynamic AID registration APIs for HCE. 
* commit 'aa1492d1d8c5f80e074faacb83905bd07487975d':
  Dynamic AID registration APIs for HCE.
 2014-04-23 20:26:43 +00:00
Martijn Coenen
aa1492d1d8 Dynamic AID registration APIs for HCE. 
Adds a set of APIs that allows applications
to dynamically register and unregister AID groups
for HCE and Secure Element based services.

Change-Id: I08e9423dff405955cb725c87423c953a7dbe5c72
 2014-04-23 20:21:32 +00:00
Alan Viverette
426a6bc99d am 6f6e64a7: Merge "Add null bg check to switch" 
* commit '6f6e64a7a3fbcc01950d610820f441853601b3f9':
  Add null bg check to switch
 2014-04-23 20:00:42 +00:00
Deepanshu Gupta
0ee958ce44 am 5c1d4327: Merge "Add view cookies for action bar menus." 
* commit '5c1d43272904398ba4b82c80ed2e6809d7dd9572':
  Add view cookies for action bar menus.
 2014-04-23 19:56:19 +00:00
Alan Viverette
6f6e64a7a3 Merge "Add null bg check to switch" 2014-04-23 19:54:04 +00:00
Emily Bernier
34a617456b am 9c32cd49: Fix build. 
* commit '9c32cd498a8067d4487a97fbf93d8587bfcec1fd':
  Fix build.
 2014-04-23 19:52:05 +00:00
Alan Viverette
aec98fee14 Add null bg check to switch 
BUG: 14271950
Change-Id: I6f4833c916ddc8d939f5bfa6ab7b1ed1993e862e
 2014-04-23 12:51:16 -07:00
Deepanshu Gupta
5c1d432729 Merge "Add view cookies for action bar menus." 2014-04-23 19:50:00 +00:00
Emily Bernier
9c32cd498a Fix build. 
Don't link to MANAGE_USERS permission in Javadoc.

Change-Id: Iad1391a0281a3fad06529a86b277f787791e94fc
 2014-04-23 15:42:10 -04:00
Deepanshu Gupta
1001961f90 Add view cookies for action bar menus. 
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.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
 2014-04-23 12:27:30 -07:00
Craig Mautner
d76b43a86f am 5723feba: Merge "Introduce PersistableBundle" 
* commit '5723febadc1877c045389afffa111913698e32e2':
  Introduce PersistableBundle
 2014-04-23 18:53:37 +00:00
Craig Mautner
5723febadc Merge "Introduce PersistableBundle" 2014-04-23 18:48:56 +00:00
Emily Bernier
9601bbb473 am 8a0fa6e8: Merge "Allow device or profile owner app to modify user restrictions." 
* commit '8a0fa6e823ddbdfd17869d52f838b1cc0a46bd2b':
  Allow device or profile owner app to modify user restrictions.
 2014-04-23 18:32:21 +00:00
Emily Bernier
8a0fa6e823 Merge "Allow device or profile owner app to modify user restrictions." 2014-04-23 18:27:45 +00:00
Emily Bernier
7a2b4d11c7 Allow device or profile owner app to modify user restrictions. 
Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448
 2014-04-23 14:20:15 -04:00
Selim Gurun
a3bb66a75e Tune down the linkify false positive rate 
Bug: 14066316

Tune down the false positive rate by restricting gTLD pattern a little bit.

Change-Id: I7bd39633d3267930593bd7231f764c110293301f
 2014-04-23 11:17:20 -07:00
Alan Viverette
b7a11d78c4 am 70ad9bc0: Fix null and bounds checks 
* commit '70ad9bc03341cc0a5b8d6c9c1f43afac6bcc9c62':
  Fix null and bounds checks
 2014-04-23 17:41:18 +00:00
Alan Viverette
70ad9bc033 Fix null and bounds checks 
BUG: 14271950
BUG: 14271753
BUG: 14270202
Change-Id: I8708107d3803b170a323f584a268ea6b096458ce
 2014-04-23 10:20:11 -07:00
Neil Fuller
13b1d7000d am ceb5d17f: am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'ceb5d17f6a2f5c144948ada1d59ec4f12da64799':
  Changes to support asynchronous close interruption
 2014-04-23 16:55:04 +00:00
Neil Fuller
ceb5d17f6a am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
  Changes to support asynchronous close interruption
 2014-04-23 16:51:47 +00: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
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
Jorim Jaggi
1083139ad7 am e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 
* commit 'e84d544fe4b238efc408280ec7e01f9c3f04a1b6':
  Move redaction logic showing from Keyguard to PhoneStatusBar.
 2014-04-23 16:28:27 +00:00