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

137002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
092125dbbb am 4f19a458: (-s ours) Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 
* commit '4f19a458ab5de74ad17257594db09b02f0d5f9e0':
  DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications
 2014-05-28 00:34:15 +00:00
Griff Hazen
24f1e5342e Merge "DO NOT MERGE Cherry-pick: Fix current.txt" into lmp-preview-dev 2014-05-28 00:32:01 +00:00
Griff Hazen
9ed2e4e465 Merge "DO NOT MERGE Cherry-pick: Fix build: CheckBuild line for removed wearable package" into lmp-preview-dev 2014-05-28 00:31:53 +00:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Jose Lima
ca7ddbfef7 am 00430954: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 
* commit '004309546b7efa188df56e58539e4227ed192cf7':
  Only allow 1 Stack on Leanback-only devices
 2014-05-28 00:13:36 +00:00
Chris Craik
f87ec6a644 am 365dfe93: Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 
* commit '365dfe93dd3baab1417e20bc9ba7e3175600faa0':
  Update docs around empty/null outline behavior
 2014-05-28 00:13:31 +00:00
Jose Lima
80962666b8 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-28 00:10:15 +00:00
Chris Craik
ddce68996b Merge "Update docs around empty/null outline behavior" into lmp-preview-dev 2014-05-28 00:08:58 +00:00
Igor Murashkin
5fe5bcaeaa am dc0230fc: Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 
* commit 'dc0230fc450e8880fb640cd476f2248bf0a401e4':
  camera2: Add partial results to the capture listener (API change)
 2014-05-27 23:57:36 +00:00
Igor Murashkin
79458826c6 Merge "camera2: Add partial results to the capture listener (API change)" into lmp-preview-dev 2014-05-27 23:54:21 +00:00
Jose Lima
a5c7e0f80f Only allow 1 Stack on Leanback-only devices 
- For Leanback only devices we will force all activities to
   live in the same app stack. This is a design decision for the
   shy/gregarious changes we are planning to implement for
   leanback devices.

Change-Id: I201f56541ba22356e9598f09419ad41e588c74dc
 2014-05-27 16:51:35 -07:00
Adrian Roos
b9fc22029f am 9fb0925e: Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 
* commit '9fb0925e0ea64ac6124cc0c843db05155cc4ea64':
  Add and improve logged TrustAgent connection events
 2014-05-27 23:50:36 +00:00
Adrian Roos
26690339e9 Merge "Add and improve logged TrustAgent connection events" into lmp-preview-dev 2014-05-27 23:46:50 +00:00
Nick Kralevich
263e006250 Merge "Fix Tethering NPE" 2014-05-27 23:25:10 +00:00
Griff Hazen
69170a56c6 am be5898b1: am 6f72ac5d: Doc fixes for Notification.WearableExtender 
* commit 'be5898b198a9eee2d21eeff345ed19573d37257a':
  Doc fixes for Notification.WearableExtender
 2014-05-27 22:47:27 +00:00
Griff Hazen
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender 
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
 2014-05-27 22:44:28 +00:00
Nick Kralevich
70c117a873 Fix Tethering NPE 
Bug: 10733373
Change-Id: I1d81eb8a60be2b672b925be7577f1288fe870237
 2014-05-27 15:31:41 -07:00
Dave Langemak
fedbe2723a am 4a6a8e5e: Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 
* commit '4a6a8e5e3cce491064d6836b59c23fd076de56f2':
  Move dis/enable of mobile data to Telephony
 2014-05-27 22:24:21 +00:00
Jeff Brown
aae5886ad8 Merge "Split frameworks/base using inclusion and exclusion rules." 2014-05-27 21:47:06 +00:00
Dave Langemak
dab839e047 Merge "Move dis/enable of mobile data to Telephony" into lmp-preview-dev 2014-05-27 21:26:52 +00:00
Deepanshu Gupta
b00cb8b8c7 Merge "Layoutlib fixes for L" 2014-05-27 21:18:04 +00:00
Chris Craik
67c360f3d5 Update docs around empty/null outline behavior 
bug:15257846
Change-Id: Ie4d1b0aaeb900eaaa7e54097f3e0d795beb8f445
 2014-05-27 14:10:17 -07:00
Deepanshu Gupta
335daa8c6c Merge "Recurse into directories to find fonts." 2014-05-27 20:59:17 +00:00
Deepanshu Gupta
b6f583aa70 Recurse into directories to find fonts. 
We now recurse into directories to find all fonts. This change is needed
to prevent having to list all fonts in external/google-fonts
individually.

As a side effect, we now only copy xml files over.

Change-Id: Ifdea3b8451878c2449ac7c5e17ef3d1b00d1b955
 2014-05-27 13:57:15 -07:00
Leon Scroggins III
8f8c085164 Merge "Remove call to deprecated SkBitmap::asImageInfo." 2014-05-27 20:42:44 +00:00
Deepanshu Gupta
233a0ae88d Merge "Parallel processing of the fonts." 2014-05-27 20:34:57 +00:00
Jorim Jaggi
51c9108cab am 4caed7a3: Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev 
* commit '4caed7a3d8c0f6b378205cc85e7e1340d56a48c0':
  Remove charging text and carrier label on bouncer.
 2014-05-27 20:32:40 +00:00
Ashish Sharma
87e522efcc am 7279017f: Include START event (reboots) in partial history. 
* commit '7279017f52ca1db58eb95bf881f3a2e238a7c2bd':
  Include START event (reboots) in partial history.
 2014-05-27 20:32:34 +00:00
Jorim Jaggi
2d6f780cc5 Merge "Remove charging text and carrier label on bouncer." into lmp-preview-dev 2014-05-27 20:30:28 +00:00
Robert Greenwalt
afa05c0b43 Move dis/enable of mobile data to Telephony 
ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
 2014-05-27 20:28:50 +00:00
Ashish Sharma
6020071df9 Include START event (reboots) in partial history. 
Change-Id: Ia1e5fba6c2c7bdb3f09eb5958d7134564d60e8b0
 2014-05-27 20:27:59 +00:00
Jorim Jaggi
071956a6dd am f4f40563: Merge "Remove up pointing arrow in navbar." into lmp-preview-dev 
* commit 'f4f405636e11bd79128135c60d1fa92ab53fc3f2':
  Remove up pointing arrow in navbar.
 2014-05-27 20:27:36 +00:00
Jorim Jaggi
6ecbe3f2d6 Merge "Remove up pointing arrow in navbar." into lmp-preview-dev 2014-05-27 20:24:48 +00:00
Jorim Jaggi
7b0de297e1 Remove up pointing arrow in navbar. 
We don't need it anymore. Yay!

Bug: 15283575
Change-Id: Iac5543a733c047711e5c37f290758456116469a5
 2014-05-27 22:22:51 +02:00
Jorim Jaggi
40a0b38160 Remove charging text and carrier label on bouncer. 
But still show it for SIM PIN/PUK.

Bug: 15283575
Change-Id: Id343e5b2fb5c695f46cd23d8509109987fa2d290
 2014-05-27 22:20:37 +02:00
Leon Scroggins III
28408c2395 Remove call to deprecated SkBitmap::asImageInfo. 
Instead, call SkBitmap::info().

Change-Id: Ib6e56c6e103afa5748405574043860449c33c467
 2014-05-27 16:20:21 -04:00
ztenghui
bd67759a3d Merge "Bring the group tag back to VectorDrawable." 2014-05-27 20:08:23 +00:00
John Spurlock
60a46d62a8 am 97c0a61f: Better wifi-enabled signal from network controller. 
* commit '97c0a61f4a239889e6ffc91994ac90e25a09f997':
  Better wifi-enabled signal from network controller.
 2014-05-27 19:57:34 +00:00
Jean-Michel Trivi
1ad0192800 DO NOT MERGE temporary hide of AudioAttributes 
Bug 15089989

Change-Id: I6077d4906d5624be4dd2b8a5c3378a04c848b6d8
 2014-05-27 12:44:05 -07:00
John Spurlock
3d09bbd04f Better wifi-enabled signal from network controller. 
The old "is wifi enabled" signal was geared toward the cluster
view.  Since the clients of the callbacks are now only QS tiles,
make sure to plumb through the actual enabled value all the way
up to the tile.

Bug:15161053
Change-Id: I8b69c599f06d5b36e3f44dc666e1621840ffd927
(cherry picked from commit fd0ea545d47b19c2ebff203a6e768a60698f3609)
 2014-05-27 19:34:10 +00:00
Deepanshu Gupta
c7919924c6 Parallel processing of the fonts. 
Font renaming for the SDK is now done in parallel.

This now reduces the running time for this script from about 30 mins to
about 5 to 10 mins. More speedup is expected when fonttools is updated.

Change-Id: I2c405f6d3e637e3067c8a1653e3cae206c32c0c3
 2014-05-27 12:31:13 -07:00
Winson Chung
a64a5fe68c am bff02603: Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev 
* commit 'bff026033d40ee48e9bf8dca17e1fbbee8b41293':
  Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)
 2014-05-27 19:30:40 +00:00
Winson Chung
8804ce96b1 Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev 2014-05-27 19:28:51 +00:00
Aravind Akella
1a68f24ab7 Merge "Adding wakeup sensors, maxDelay to java SDK." 2014-05-27 19:25:41 +00:00
Chris Wren
42db9d0b23 am ba8af498: Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 
* commit 'ba8af498f08d4ac2e7712a8d307d24112ca1bc8e':
  Reduce logspam by catching unexpected types ourselves.
 2014-05-27 19:20:56 +00:00
Chris Wren
2ed67e6de7 Merge "Reduce logspam by catching unexpected types ourselves." into lmp-preview-dev 2014-05-27 19:15:25 +00:00
Jorim Jaggi
64554ad5f1 am 554f868c: Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 
* commit '554f868c94ad72ef12b6f2c966bd9709ead5c4e7':
  Skeleton for Keyguard security method appear animations.
 2014-05-27 18:34:38 +00:00
Jorim Jaggi
c41a7a1bb6 am 80aee1d5: Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 
* commit '80aee1d5e5d0095551c76fc4d52fa0616b0e5aeb':
  Show bouncer immediately when MOTION_UP is received
 2014-05-27 18:34:33 +00:00
Jorim Jaggi
fbd168331c Merge "Skeleton for Keyguard security method appear animations." into lmp-preview-dev 2014-05-27 18:31:57 +00:00
Jorim Jaggi
37d5c23998 Merge "Show bouncer immediately when MOTION_UP is received" into lmp-preview-dev 2014-05-27 18:31:10 +00:00