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

219763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
ae5a53d78c Merge "Update volume slider on device changed." into mnc-dr-dev 2015-10-15 13:44:04 +00:00
Julia Reynolds
607479d109 am 86fdb662: am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '86fdb662a3d9c34099248910756ca18cd0b3b2f1':
  Selectively show zen footer.
 2015-10-15 13:43:17 +00:00
Julia Reynolds
86fdb662a3 am 4f836839: am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '4f836839c19aed433e7b1913ce05ccb129743fd7':
  Selectively show zen footer.
 2015-10-15 13:39:28 +00:00
Julia Reynolds
4f836839c1 am 67ea77ec: Merge "Selectively show zen footer." into mnc-dr-dev 
* commit '67ea77ec3fd838e1a367ad6f367970599e599a99':
  Selectively show zen footer.
 2015-10-15 13:33:35 +00:00
Julia Reynolds
67ea77ec3f Merge "Selectively show zen footer." into mnc-dr-dev 2015-10-15 13:29:51 +00:00
Jun Mukai
1db5397d88 Allow changing mouse pointer icon for the current context. 
Right now, it only supports I-beam on EditText, but further
rules will come in the future.

The png files for the icons are from chromium.

Bug: 24180385
Change-Id: I8de4ec8a5412b4830c08aa232c5083841c5c751c
 2015-10-15 01:47:29 -07:00
Adrian Roos
0a5e256d9f Merge "Send next alarm's show intent via PendingIntent" 2015-10-15 06:29:40 +00:00
Johan Euphrosine
e3ac68e11c Merge "docs/sdk/installing: update jdk link to match with the installer" 2015-10-15 06:29:11 +00:00
Adrian Roos
62692b22fb Send next alarm's show intent via PendingIntent 
Also send all IntentTile intents via PendingIntent.

Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
 2015-10-14 20:23:02 -07:00
Chris Thornton
f342fb2f45 am 09822ec6: am 11543a1b: am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit '09822ec619c2edb22b6423702c892c9d9d94718a':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 03:21:43 +00:00
Dianne Hackborn
85525040dd am 1e46ee93: am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '1e46ee937c94247ab0fe2b0ff1e2b9b26a9f02fa':
  Docs only change: update build version docs.
 2015-10-15 03:21:28 +00:00
Adrian Roos
055c33b0c8 am d06f20f9: (-s ours) am 67255b44: am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit 'd06f20f9e1dd7be42225896e6eb34354c33392e6':
  Send next alarm's show intent via PendingIntent
 2015-10-15 03:21:17 +00:00
Seigo Nonaka
2d04780803 Remove MinikinSkiaFont::GetGlyph. 
MinikinSkiaFont::GetGlyph is no longer used and MinikinFont:GetGlyph
interface is removed by I13398503841ac06f930b04815017d4b33338efa1.
No behavior chnages are expected with this CL.

Change-Id: I8496aad446c6809f74a5effc7ef1baa25c4381b8
 2015-10-15 02:52:38 +00:00
Roozbeh Pournader
22ba3a4ace am 97c9c484: am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '97c9c484959bd4b2fc6bac99c544d8b562e8f1c8':
  Load binary hyphen data files
 2015-10-15 01:56:24 +00:00
Chris Craik
18a759df06 Throw IndexOutOfBoundsException for invalid start/count values 
bug:24878587

Change-Id: I2f1a68ebbc546a2d7fc3a3eacfaf1333371b2a0c
 2015-10-14 18:52:11 -07:00
Chris Thornton
09822ec619 am 11543a1b: am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit '11543a1b852e5e87d37f5fbe95131d0f1d9afbee':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 01:43:57 +00:00
Chris Thornton
11543a1b85 am ea5ad487: am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit 'ea5ad4872ec9efb27c33796e60458b4a1e3905f4':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 01:33:36 +00:00
Chris Thornton
ea5ad4872e am d8ef44bc: Merge "Don\'t call StopRecognition when recognition was aborted." into mnc-dr-dev 
* commit 'd8ef44bc51a4a27cd9a57c880a367636a1377082':
  Don't call StopRecognition when recognition was aborted.
 2015-10-15 01:28:39 +00:00
Chris Thornton
d8ef44bc51 Merge "Don't call StopRecognition when recognition was aborted." into mnc-dr-dev 2015-10-15 01:24:45 +00:00
Dianne Hackborn
1e46ee937c am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '522222bc9bbfb6d62e101eaa6af2668277143e19':
  Docs only change: update build version docs.
 2015-10-15 01:16:00 +00:00
Dianne Hackborn
522222bc9b am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit 'f96ca3441ea1a22e4d9e4402942ddce4a3234860':
  Docs only change: update build version docs.
 2015-10-15 01:12:35 +00:00
Dianne Hackborn
f96ca3441e am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit '75765dbe48ed38d7044f458062510a9082750049':
  Docs only change: update build version docs.
 2015-10-15 01:05:54 +00:00
Dianne Hackborn
75765dbe48 am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev 
* commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
  Docs only change: update build version docs.
 2015-10-15 01:01:12 +00:00
Dianne Hackborn
e34445f11a Merge "Docs only change: update build version docs." into mnc-dev 2015-10-15 00:56:05 +00:00
Adrian Roos
d06f20f9e1 am 67255b44: am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '67255b4403df91d8405506ecac6965367093cd6b':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:54:34 +00:00
Robert Carr
38451b8247 WindowStateAnimation: Clear transformation clip rect. 
Ensure the clip rect taken from transformations is cleared
when there is no transformation. Normally the failure to
clear the clip would not cause a problem, as the final clip
would be equal to the window size. However, in the event that
the window scale goes on to change (WindowState::m(H/V)Scale that is)
the clip will now be specified at the inappropriate scale (notice the
way the clip must be divided by H/VScale as SurfaceFlinger will apply
the surface transform to the clip).

Bug:24298694
Change-Id: I4548e8ecea8d66d4942e99823653a7b05f87cea0
(cherry picked from commit 2f0fe62c5426533ccdf9ec7ef28027c367286979)
 2015-10-15 00:53:35 +00:00
Adrian Roos
67255b4403 am c007c150: am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit 'c007c150d5f56305e84af44d7993d8f2e6a4fc78':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:45:23 +00:00
Adrian Roos
c007c150d5 am 8630e18a: am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '8630e18a297801238efcba8760e8d850d8920a80':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:40:45 +00:00
Adrian Roos
8630e18a29 am 31f19c44: Merge "Send next alarm\'s show intent via PendingIntent" into mnc-dev 
* commit '31f19c444f5f9d22c81fcb339e51bee465ba10f9':
  Send next alarm's show intent via PendingIntent
 2015-10-15 00:35:33 +00:00
Roozbeh Pournader
97c9c48495 am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit 'f12a7499dee29904ef15d4f7f9ef60e0ebc4c341':
  Load binary hyphen data files
 2015-10-15 00:31:44 +00:00
Adrian Roos
31f19c444f Merge "Send next alarm's show intent via PendingIntent" into mnc-dev 2015-10-15 00:29:56 +00:00
Roozbeh Pournader
f12a7499de am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '9407aa7cf0b369d31bd6c69f9c26bdf6a1f44fe9':
  Load binary hyphen data files
 2015-10-15 00:27:29 +00:00
Chris Craik
c044667fc0 Merge "Initial commit of new Canvas operation recording / replay" 2015-10-15 00:27:14 +00:00
Roozbeh Pournader
9407aa7cf0 am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
  Load binary hyphen data files
 2015-10-15 00:22:43 +00:00
Roozbeh Pournader
63aa02e47f Merge "Load binary hyphen data files" into mnc-dr-dev 2015-10-15 00:18:36 +00:00
Adam Powell
b60d985561 am 2271385a: am bd4d81b0: am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit '2271385ad8845d86af2a3aba6b03ec3113e9b9be':
  Fix bugs introduced in ChooserActivity
 2015-10-15 00:13:47 +00:00
Adam Powell
2271385ad8 am bd4d81b0: am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit 'bd4d81b08cc5d961da294c683a73c6c13e3eb931':
  Fix bugs introduced in ChooserActivity
 2015-10-15 00:08:14 +00:00
Adam Powell
bd4d81b08c am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit 'b248077a8a239fe6fe28775a7472a89ff42fdec3':
  Fix bugs introduced in ChooserActivity
 2015-10-15 00:01:29 +00:00
Amit Mahajan
0a328c835d am 21fd4754: am a41ea5e9: am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit '21fd47548be421750cdcaf8e0c357747e927198d':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:59:32 +00:00
Amit Mahajan
21fd47548b am a41ea5e9: am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit 'a41ea5e95092674983ab4ae97788184c27ed64b6':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:54:08 +00:00
Adam Powell
b248077a8a am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 
* commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c':
  Fix bugs introduced in ChooserActivity
 2015-10-14 23:52:14 +00:00
Amit Mahajan
a41ea5e950 am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit '8fb8c37ca7c2c57466b07548effa24044e5b3ef6':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:50:11 +00:00
Bryce Lee
b96d89cd34 Add capability to identify phone accounts that are emergency only. 
Bug: 24756957
Change-Id: Id26eaa7f6632674f7122b4cd658cbe2bf9b04594
 2015-10-14 16:48:40 -07:00
Adam Powell
2eac005bbf Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev 2015-10-14 23:46:32 +00:00
destradaa
2e38507b70 Fix exception while shutting down FLP HW 
Bug: 24877230
Change-Id: I7c342641b87ae6b1fd3623e4436fd985f67e1848
 2015-10-14 16:45:58 -07:00
Amit Mahajan
8fb8c37ca7 am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 
* commit '7b28e6ec96dfcb20cef1f321ac7539bac439d726':
  Adding config to allow/disallow user to add APNs.
 2015-10-14 23:42:13 +00:00
Amit Mahajan
7b28e6ec96 Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev 2015-10-14 23:33:02 +00:00
Chris Craik
b565df13a9 Initial commit of new Canvas operation recording / replay 
Done:
- drawRect, drawBitmap, drawColor, drawPaint, drawRenderNode, drawRegion
- Recording with new DisplayList format
- batching & reordering
- Stateless op reorder
- Stateless op rendering
- Frame lifecycle (clear, geterror, cleanup)

Not done:
- SaveLayer (clipped and unclipped)
- HW layers
- Complex clipping
- Ripple projection
- Z reordering
- Z shadows
- onDefer prefetching (text + task kickoff)
- round rect clip
- linear allocation for std collections
- AssetAtlas support

Change-Id: Iaf98c1a3aeab5fa47cc8f9c6d964420abc0e7691
 2015-10-14 16:10:40 -07:00
Vineeta Srivastava
49879ef110 am 3bac5a40: am ec3513e9: am ecf89edf: am 8a586c55: Merge "TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar" into mnc-dr-dev 
* commit '3bac5a4043e616f53ce36f8010d3b84b8f716697':
  TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar
 2015-10-14 22:02:23 +00:00
Winson
c89d516e09 Fixing merge conflict from DR to master. 
Change-Id: Id76602204dffa2745534e8290a14e407de639c0b
 2015-10-14 14:58:51 -07:00