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

35786 Commits

Author SHA1 Message Date
Chris Craik
a5826864ed am 2cfb1caa: Merge "Refactor Drawable outline production, flesh out Outline methods" 
* commit '2cfb1caaddd33f768a1fb66a82f373469da995f5':
  Refactor Drawable outline production, flesh out Outline methods
 2014-04-25 16:26:21 +00:00
Chris Craik
07f0b8ee73 Merge "Refactor Drawable outline production, flesh out Outline methods" 2014-04-25 16:22:26 +00:00
Colin Cross
3b687a155d am c955677c: fix build 
* commit 'c955677c1b2e03ad048e034bd033dd66dfd72ef3':
  fix build
 2014-04-25 16:17:39 +00:00
Selim Gurun
4b0d678d08 am da5c5325: am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'da5c532573bcdd1698822384e9e20d7e64195987':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 16:17:14 +00:00
Christopher Tate
a566a98de9 am 2ac0462e: Merge "Send factory reset notification broadcasts at foreground priority" 
* commit '2ac0462e7bdf0f7cfc8163bfa31cf4a90161a879':
  Send factory reset notification broadcasts at foreground priority
 2014-04-25 16:08:47 +00:00
Dianne Hackborn
6f467d3e43 am 898be168: Merge "Add support for muliple active development codenames." 
* commit '898be168bda75b204611e8e24439d33213ecab5f':
  Add support for muliple active development codenames.
 2014-04-25 16:08:31 +00:00
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
Colin Cross
c955677c1b fix build 
When commit 4e48f40b03 merged from
AOSP it added a hunk that was already present.  Remove the second
copy.

Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
 2014-04-24 22:45:05 -07:00
Selim Gurun
da5c532573 am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '7466e3bbbd13b563e1a5adcc537ea0f132045038':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:19:31 +00:00
Selim Gurun
7466e3bbbd am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:15:36 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl. 
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
 2014-04-24 18:04:04 -07:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl" 
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
 2014-04-25 00:47:23 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl 
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
 2014-04-24 17:31:07 -07:00
Christopher Tate
2ac0462e7b Merge "Send factory reset notification broadcasts at foreground priority" 2014-04-25 00:26:05 +00:00
Chris Craik
e6a39b1265 Refactor Drawable outline production, flesh out Outline methods 
Change-Id: I1b8c25384b5f123e86cf5e0b2270eb741bc3159b
 2014-04-24 16:58:18 -07:00
Dianne Hackborn
898be168bd Merge "Add support for muliple active development codenames." 2014-04-24 23:43:49 +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
Dianne Hackborn
ffcda10861 Add support for muliple active development codenames. 
The resource API level is also bumped by the number of
active codenames there are.

Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
 2014-04-24 16:18:43 -07:00
Christopher Tate
e27ae55d6d Send factory reset notification broadcasts at foreground priority 
Bug 14296706

Change-Id: I07b39e808dbf724f5edd4a11445de3e47c9e862b
 2014-04-24 15:13:13 -07: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