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

38695 Commits

Author SHA1 Message Date
Selim Gurun
65fb1dafe4 am 7d5a5cbf: Merge "Add ClientCert support" 
* commit '7d5a5cbfd96610cfe6ad7f1760e24284d6c8e168':
  Add ClientCert support
 2014-04-25 16:08:20 +00:00
Winson Chung
0aed0dd40a am 67b082e0: Merge "Enabling doc centric recents on phones." 
* commit '67b082e02cbfb7bafe046a619e686e9a5c1abc05':
  Enabling doc centric recents on phones.
 2014-04-25 16:08:17 +00:00
Chris Craik
3b951a2190 am 06916dcb: Merge "Add floats-only drawRoundRect to Canvas" 
* commit '06916dcb05eeee8c809bb18d170a3f73b5ee1427':
  Add floats-only drawRoundRect to Canvas
 2014-04-25 15:52:52 +00:00
Jeff Davidson
004ab8cc95 am ede08340: Merge "API tweaks for network score settings." 
* commit 'ede08340e1ac6b783cba52944474c28013f59cf9':
  API tweaks for network score settings.
 2014-04-25 15:51:47 +00:00
Selim Gurun
7d5a5cbfd9 Merge "Add ClientCert support" 2014-04-24 23:26:09 +00:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00
Chris Craik
06916dcb05 Merge "Add floats-only drawRoundRect to Canvas" 2014-04-24 21:56:41 +00:00
Selim Gurun
b6aa97e0a0 Add ClientCert support 
Bug: 12983007

This is to add APIs for client certificates. Keep the APIs hidden
until finalizing the design.

Change-Id: I8a1e755e2c509cf821dff7c7df0ddd5270a5f79b
 2014-04-24 14:27:33 -07:00
Chris Craik
4d1c1538e2 Add floats-only drawRoundRect to Canvas 
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
 2014-04-24 14:23:52 -07:00
Evan Charlton
5e78e76ad7 resolved conflicts for merge of 806047ca to master-nova 
Change-Id: I6754198919b952bd733733572f64a316cb41b101
 2014-04-24 13:56:19 -07:00
Jeff Davidson
ede08340e1 Merge "API tweaks for network score settings." 2014-04-24 18:58:56 +00:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +00:00
Adam Powell
58f54dc59d am 46ca5060: Merge "Nested scrolling!" 
* commit '46ca506022cb51543dea0489587477f60c570d5f':
  Nested scrolling!
 2014-04-24 18:27:37 +00:00
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio. 
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
 2014-04-24 11:21:30 -07:00
Adam Powell
46ca506022 Merge "Nested scrolling!" 2014-04-24 18:20:43 +00:00
Adam Powell
10ba27734e Nested scrolling! 
or, "Excuse me, Egon, you said crossing the streams was bad."

Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.

Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.

Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
 2014-04-24 10:48:52 -07:00
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
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
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