Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
aed35d6b57 Merge "Not include fullscreen opaque window on screenshot" 2014-11-26 17:37:37 +00:00
Craig Mautner
6c3548a961 am e7648472: Merge "Measure absolute value of pointer motion distance" 
* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance
 2014-11-26 17:31:08 +00:00
Craig Mautner
e76484721e Merge "Measure absolute value of pointer motion distance" 2014-11-26 17:26:47 +00:00
dcashman
9fd6d9d995 Merge "Remove if(true) line." 2014-11-26 17:23:01 +00:00
dcashman
0e0dbf9367 Merge "Prevent EntropyMixer from registering with service manager." 2014-11-26 17:17:00 +00:00
Jorim Jaggi
00d947bda0 Improve fling physics for recents 
- Don't limit swipe out velocity
- Make sure we pick up all touch events in VelocityTracker
- When already scrolling and touching again, don't reset scroll
  state, so we don't wait for the touch slop again to start
  scrolling (this makes it more consistent with ScrollView).

Bug: 18536759
Change-Id: I1d43c77db78beec6d0b8c949e67141a2665de892
 2014-11-26 18:14:50 +01:00
Kenny Root
3476a2a0b2 am 564ec716: Merge "Track change to Conscrypt" 
* commit '564ec716f4ac2f71d7d4e6eb481075603e183b4f':
  Track change to Conscrypt
 2014-11-26 17:13:48 +00:00
Kenny Root
564ec716f4 Merge "Track change to Conscrypt" 2014-11-26 17:09:40 +00:00
Adrian Roos
752aee8a6f Fix projection permission dialog layering 
Bug: 18392920
Change-Id: I32c2c61339cbea9edd4a7a3f80365213fb4a69ac
 2014-11-26 18:09:35 +01:00
Kenny Root
9d2d6b6b4b Track change to Conscrypt 
Change-Id: I8814fd0720acf09332927f184fdd9b2cdac4f413
 2014-11-26 09:08:40 -08:00
dcashman
4e3f5d3fe4 Remove if(true) line. 
Commit: e4d9a01bfc introduced an
if (true) block with the intention of changing it.  Remove it.

Change-Id: Ida637cb69c57b7b676f37a3397d72e0bf010523a
 2014-11-26 09:06:57 -08:00
John Spurlock
cfe9fb6794 Volume: Update remote volume icons. 
Remove last holo references by using the new-style cast connected
icon.  There is only one icon for the remote stream, since
it is never muted by policy.

Bug: 18102850
Change-Id: Iffe3a19deca6599780ebdb26869ae46aa8623f81
 2014-11-26 11:37:00 -05:00
John Spurlock
4a0e40a764 am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 
* commit 'f17f04a51e1e0b7f16d7c53015d0a66059b80cd3':
  Volume: Avoid making bad forceVolumeControlStream call.
 2014-11-26 16:35:53 +00:00
Geoff Mendal
d075d2f759 am 038c1444: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '038c144442683a633339773d23dd61cb826cad10':
  Import translations. DO NOT MERGE
 2014-11-26 16:35:48 +00:00
John Spurlock
f17f04a51e Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 2014-11-26 16:32:38 +00:00
Geoff Mendal
038c144442 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 16:30:49 +00:00
Geoff Mendal
d2160dd097 Import translations. DO NOT MERGE 
Change-Id: Ia430daa8ca9fbc8181130d7380a4ca5761d01ef1
Auto-generated-cl: translation import
 2014-11-26 08:13:55 -08:00
Jeff Davidson
daa699ce1d am 8c99018a: Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 
* commit '8c99018a98a66af968bc1dc372f2f2399308bc62':
  Handle package changes in NetworkScoreService.
 2014-11-26 16:00:08 +00:00
Jeff Davidson
e5454d5733 am f8a3b8e0: Merge "Fix WifiTile\'s Connected indicator for ephemeral networks." into lmp-mr1-dev 
* commit 'f8a3b8e008c1214afb3de99a7bccb08aa8f86796':
  Fix WifiTile's Connected indicator for ephemeral networks.
 2014-11-26 16:00:03 +00:00
Jeff Davidson
8c99018a98 Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 2014-11-26 15:55:18 +00:00
Jeff Davidson
f8a3b8e008 Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev 2014-11-26 15:54:25 +00:00
Geoff Mendal
9641feee02 am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '38499cf8a129b15fd526d45aad96657d96235abf':
  Import translations. DO NOT MERGE
 2014-11-26 15:13:40 +00:00
Geoff Mendal
e2d619b663 Merge "Import translations. DO NOT MERGE" 2014-11-26 15:12:02 +00:00
John Spurlock
e506c85eaa Volume: Avoid making bad forceVolumeControlStream call. 
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.

Bug: 18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
 2014-11-26 10:11:19 -05:00
Geoff Mendal
cb3a6f89f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 15:10:41 +00:00
Geoff Mendal
8d08e39018 Import translations. DO NOT MERGE 
Change-Id: I281db36394df99897f90cbf5c460cc141a4af569
Auto-generated-cl: translation import
 2014-11-26 07:09:05 -08:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
014aba26ed Import translations. DO NOT MERGE 
Change-Id: I1c487be2ef6c76224feae69f285a18ef0eda4840
Auto-generated-cl: translation import
 2014-11-26 07:03:09 -08:00
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE 
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
 2014-11-26 06:56:43 -08:00
Geoff Mendal
3efcd8da61 am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '441d4f04d1e7a3223449add1c70d9d2831277d0e':
  Import translations. DO NOT MERGE
 2014-11-26 14:50:06 +00:00
Jorim Jaggi
f1b05619cc am 95e89cae: Fix jank when pin/pattern is shown 
* commit '95e89caeb252a54807c76d60c7440766829e418c':
  Fix jank when pin/pattern is shown
 2014-11-26 14:49:56 +00:00
Jorim Jaggi
c5c2e53779 Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 2014-11-26 14:48:47 +00:00
Geoff Mendal
19475c24a9 Import translations. DO NOT MERGE 
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
 2014-11-26 06:39:40 -08:00
Geoff Mendal
57086523d5 Import translations. DO NOT MERGE 
Change-Id: Ic378d28436a78faca2428b60431714db6dc7a0f2
Auto-generated-cl: translation import
 2014-11-26 06:35:08 -08:00
Geoff Mendal
441d4f04d1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 14:32:45 +00:00
Geoff Mendal
92ed2ec015 Import translations. DO NOT MERGE 
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
 2014-11-26 06:31:37 -08:00
Jorim Jaggi
d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev 
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
 2014-11-26 15:17:14 +01:00
Jorim Jaggi
95e89caeb2 Fix jank when pin/pattern is shown 
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
  when reset gets called)
- Check for actual used security method when updating states for
  bouncer

Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
 2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Lajos Molnar
fdc9e9de08 am d4604b4f: am c60a5d78: am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit 'd4604b4fd370fa54d94ec94e6137b093f9f3da8c':
  media: add support for 160-byte image info in MediaCodec
 2014-11-26 12:09:56 +00:00
Paul Crowley
5ff0e5fb6b am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 
* commit '0d122e265c52ef25dbad652378b3a5e51a86f041':
  Add flag for wiping factory reset protection data.
 2014-11-26 12:09:51 +00:00
Amit Mahajan
bc2f1371bb am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 
* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
  Adding helper functions to retrieve settings that are stored per subId.
 2014-11-26 12:09:47 +00:00
John Reck
e39f788950 am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:09:42 +00:00
Jorim Jaggi
2edf7d6065 am 2f47df83: am dccd3662: am c1de25d8: Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 
* commit '2f47df83343e51214c792dc89874f0bccbeb4593':
  Animate notifs depending on touch when exiting doze mode
 2014-11-26 12:09:37 +00:00
Robin Lee
e07f2c01af am a7ffed86: am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about managed profile CAs" into lmp-mr1-dev 
* commit 'a7ffed86fce0a0cab8915bd6a727605959f08bb7':
  DevicePolicy: Don't warn about managed profile CAs
 2014-11-26 12:09:33 +00:00
Chris Craik
3c96a2b8fe am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
  Improve DisplayList state output
 2014-11-26 12:09:28 +00:00
Dianne Hackborn
6a2acff8c1 am 6df037ac: am bafddb4a: am d0f6b4f6: Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 
* commit '6df037ac5d2b4b6f027ca36284ee09ed10970cd8':
  Start MountService before performBootDexOpt
 2014-11-26 12:09:24 +00:00
John Spurlock
97abe5040a am a2decb0e: am f74ae93c: am bc6f59a1: Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 
* commit 'a2decb0e4d50c68391b82e7acf6c425df2f30dd6':
  VolumeZen: Introduce internal vs external ringer mode.
 2014-11-26 12:09:18 +00:00
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 12:08:47 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00