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

128957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
25807936e8 Add carrier text on lockscreen in top left corner. 
Change-Id: I88c96eabc4b97295da5c1094db3fd22fcc637390
 2014-04-25 14:18:07 +02:00
Kenny Root
97efc15b32 Merge "PackageManager: remove GET_CERTIFICATES boolean" 2014-04-24 20:51:49 +00:00
Kenny Root
07c79fcc7f PackageManager: remove GET_CERTIFICATES boolean 
This is a really old debugging flag that is not useful and also
dangerous.

Change-Id: I3badb5e361a8fe8458a355bf7d9ab055cb1b57d5
 2014-04-24 13:40:11 -07:00
Jorim Jaggi
fb2b6bc62d Merge "Add text view for double-tap and unlock hint on Keyguard." 2014-04-24 20:34:30 +00:00
Jorim Jaggi
e70d31f48d Add text view for double-tap and unlock hint on Keyguard. 
Bug: 14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
 2014-04-24 22:08:30 +02:00
Dianne Hackborn
d80cb24a57 Merge "Fix api." 2014-04-24 19:00:30 +00:00
Dianne Hackborn
b3c90a2bfb Fix api. 
Change-Id: I5a04152a55b277b8609b033a0c35db30458e1ee2
 2014-04-24 11:59:49 -07:00
Jeff Davidson
ede08340e1 Merge "API tweaks for network score settings." 2014-04-24 18:58:56 +00:00
Nick Kralevich
38897b30b7 am 69ee6b0a: am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '69ee6b0a774346af5e621907a0508c02468b4186':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:29:50 +00:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +00:00
Nick Kralevich
69ee6b0a77 am 140dc63f: am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '140dc63f4f927a8eddddf8d11a142e6975c1c6cf':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:25:58 +00:00
Nick Kralevich
140dc63f4f am 84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 
* commit '8480384986c314bd97b841cbf7f63acb7055ecef':
  Zygote: enable CAP_BLOCK_SUSPEND capability for system server
 2014-04-24 18:22:20 +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
Nick Kralevich
8480384986 Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server" 2014-04-24 18:18:02 +00:00
Daniel Leung
49cbafad9b Zygote: enable CAP_BLOCK_SUSPEND capability for system server 
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.

Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
 2014-04-24 19:12:38 +01:00
ztenghui
d2cd53d4e5 Merge "Shoot the rays to the vertices of the incoming polygon." 2014-04-24 18:03:00 +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
5e6e27edb7 Merge "Take screenshots of pausing activity" 2014-04-24 17:44:42 +00:00
Craig Mautner
f6ead5d62e Take screenshots of pausing activity 
Previous CL to optimize out excessive screenshots (ag/379669) was too
effective and didn't take screenshots when going into an activity
that had attribute Window_windowNoDisplay. Adding in the test for
ActivityRecord.noDisplay allows screenshots for this situation.

Fixes bug 13410507.

Change-Id: Ieafebf44b7d1a3ba18115e762fba113f8d1c0252
 2014-04-24 10:39:36 -07: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
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
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