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

135647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
1941fc7186 Extend NotificationListenerService to support system use cases. 
Bug: 14846846
Change-Id: Ic308b2f78c86393304d446c57fd677294e01717c
 2014-05-16 11:23:50 -04:00
Dan Sandler
4ec3b0f9ab Merge "Badge largeIcons with the notification icon." 2014-05-16 15:18:40 +00:00
Adrian Roos
3242f51c93 Merge "Apply revised TrustAgent API" 2014-05-16 14:32:07 +00:00
Dan Sandler
190d58d621 Badge largeIcons with the notification icon. 
The old right-hand small icon is no more; instead the
notification's small icon is overlaid atop the largeIcon
bitmap.

If the small icon would have had a colored circle background
applied to it in the large left-hand slot, it gets a similar
treatment when used as a badge.

Change-Id: I8b262afbdd4faab2beffd294d662f4759f35f3b3
 2014-05-16 10:07:54 -04:00
Adrian Roos
7e03dfcb79 Apply revised TrustAgent API 
Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
 2014-05-16 16:06:28 +02:00
Dan Sandler
574ed553b0 Merge "Remove unneeded layouts." 2014-05-16 13:07:13 +00:00
Narayan Kamath
3bd2c6ffea am b4606676: am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit 'b4606676a8e357f7b6de049099a04438f7c1b4eb':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:34:48 +00:00
Narayan Kamath
b4606676a8 am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98 am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3 Merge "Init the static member when first used for CursorWindow." 2014-05-16 12:24:33 +00:00
Narayan Kamath
d75f1efcb9 am 0c42f3bb: (-s ours) am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit '0c42f3bb33ae4bc467d39e2f15cfff795409508b':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:18:50 +00:00
Narayan Kamath
0c42f3bb33 am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:13:49 +00:00
Narayan Kamath
2c12587620 am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit '8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:08:09 +00:00
Narayan Kamath
8a196c0676 Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-16 12:06:09 +00:00
Narayan Kamath
844a4c81ff Change InputMessage.motion.pointerSize to a uint32_t. 
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

(cherry-picked from commit bc6001b026069714177526eb1120b0011d6f2a51)

Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
 2014-05-16 12:55:48 +01:00
Kenny Guy
6f16aec6de Merge "Send profile removed intent earlier so launchers updates." 2014-05-16 11:47:49 +00:00
Selim Cinek
51dbce80ea Merge "Improved Notification Panel height logic" 2014-05-16 11:34:18 +00:00
Jungshik Jang
b0650e8ff3 Merge "Add ARC commands" 2014-05-16 06:49:18 +00:00
Griff Hazen
959591e3ba Add support for extendable actions to Notification. 
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
 2014-05-15 22:26:18 -07:00
Dan Sandler
4b069cc896 Remove unneeded layouts. 
Change-Id: I46fdb4ed07f67c749f0a7e62c7d9a657aa8e44e3
 2014-05-16 01:13:53 -04:00
Todd Poynor
540f4d6db3 BatteryManager: Add property ENERGY_COUNTER and long data type properties 
Change-Id: Ie7f9b19c5cd47a48bb33af03d51acddaa14b0243
 2014-05-16 03:04:33 +00:00
Sungsoo Lim
07d5e7d5fa Merge "Implements TtmlRenderer." 2014-05-16 01:56:17 +00:00
Jerome Poichet
8d56ff8b70 Merge "Adding Activity Action entry" 2014-05-16 01:38:33 +00:00
Deepanshu Gupta
fba1dd24bf LayoutLib: Correctly resolve ?attr/foo 
?attr/foo in platform files wasn't resolved properly. The IDE checked
the app namespace for the attribute even though it is being referenced
from a platform file.

Change-Id: I7db6dfef5b540d99804c298120578da9d060b886
 2014-05-15 17:37:34 -07:00
Chris Craik
c9ee304c91 Merge "Round rect outline clipping" 2014-05-16 00:37:29 +00:00
vandwalle
6c536eac59 Merge "autojoin fix for devices which are using the enableNEtwork API" 2014-05-16 00:21:29 +00:00
Selim Gurun
9f29702361 Merge "Webview Cleanup part 2" 2014-05-16 00:20:48 +00:00
Robert Greenwalt
00bcf01a91 Merge "Add net.dns system properties" 2014-05-16 00:06:41 +00:00
Chris Craik
deeda3d337 Round rect outline clipping 
Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
 2014-05-15 16:36:12 -07:00
Robert Greenwalt
389f5b81a0 Merge "Remove unneed clear in constructor." 2014-05-15 23:32:51 +00:00
Robert Greenwalt
d5648dcf6a Add net.dns system properties 
Some apps rely on them.

bug: 14992618
Change-Id: I5766f26b77004e9cfcc90fac657817eab67f9ac7
 2014-05-15 16:29:40 -07:00
vandwalle
13f48ffab8 autojoin fix for devices which are using the enableNEtwork API 
Bug: 15000352

Change-Id: Ib8b5dfd517e48444913f0ad0e5d08749d6eaa757
 2014-05-15 23:27:00 +00:00
Alan Viverette
22827a7f44 Merge "Deprecate FragmentBreadCrumbs, remove styles add in L" 2014-05-15 23:11:53 +00:00
RoboErik
7e89723bb4 Merge "Add UserRecords to separate user interactions" 2014-05-15 23:08:26 +00:00
Selim Gurun
6e1e0e2ec4 Webview Cleanup part 2 
Bug: 1231013

Move classes only needed by Browser to browser package.

Change-Id: I7c8080a74a15c06040e0ac0d4b713afbfd02e2e0
 2014-05-15 16:05:40 -07:00
Alan Viverette
1d90d3e4bf Deprecate FragmentBreadCrumbs, remove styles add in L 
Adds comments to the private styles so that we don't try to
update them again in the future.

BUG: 14997266
Change-Id: I0099063d1ce254682aff6bcdd051ebf8719d562b
 2014-05-15 16:04:05 -07:00
Jeff Davidson
bc3376f1c2 Merge "Fix inconsistent package name." 2014-05-15 22:54:00 +00:00
Jeff Davidson
7672ef046b Fix inconsistent package name. 
Change-Id: I6dfa0ded4309ae9e3f8ab73d96e6ccb521beb7c4
 2014-05-15 15:53:17 -07:00
Adam Powell
1326cfbd41 Merge "Update mismerged current.txt" 2014-05-15 22:39:32 +00:00
Adam Powell
ccfa115952 Update mismerged current.txt 
Change-Id: If16b714ef4cfcdc3c63cf21159390040237a3e78
 2014-05-15 15:38:37 -07:00
Deepanshu Gupta
14c9b688fc Merge "Layoutlib: Update delegates for L" 2014-05-15 22:36:41 +00:00
Alan Viverette
1a0c96696e Merge "Ensure volume preference has correct defStyleAttr" 2014-05-15 22:13:36 +00:00
Adam Powell
76d8f96805 Add content insets to Toolbar 
Content insets allow a Toolbar to define horizontal gridlines for the
start/end or left/right edges of major content (not counting the
navigation button or menu). This allows apps to align their layout
content above or below a Toolbar with the title and other contents of
the bar by using app-defined measurements.

Change-Id: Ibd7e0810bf81070eb5f59a42ad3257f35bc0156a
 2014-05-15 15:11:40 -07:00
Alan Viverette
fcb48b3ab9 Ensure volume preference has correct defStyleAttr 
BUG: 14635756
Change-Id: Id78da5df3d355a4dda9bd1b80b14df54803d5d03
 2014-05-15 15:03:36 -07:00
Dianne Hackborn
0a3103e755 Merge "Battery stats more wake history, power save mode." 2014-05-15 21:57:27 +00:00
Adam Lesinski
9e1e95f6e3 Merge "AAPT dump badging should allow refs in meta-data" 2014-05-15 21:17:33 +00:00
Adam Lesinski
b71adb6571 AAPT dump badging should allow refs in meta-data 
The framework allows references in the <meta-data>
element in an AndroidManifest.xml, so badging should
do the same.

Bug:14088271
Change-Id: Ia8157655e21adaf11b7ace90a98a9cca3c8a476c
 2014-05-15 14:14:41 -07:00
vandwalle
fa3b85cf51 Merge "autojoin is to eager to black list networks due to connection failure" 2014-05-15 21:08:34 +00:00
Paul McLean
c5d0cd895b Merge "Changed namespace of AlsaParser (and components) to correctly reflect their place in the directory hierarchy." 2014-05-15 21:02:49 +00:00
Alan Viverette
1dfa9d98be Merge "Simplify attribute extraction for themed Drawables" 2014-05-15 20:58:59 +00:00