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

153571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yigit Boyar
b9bc79f214 am 598dc534: am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '598dc5349ea1e949b1b32ffc19900f36e253efc9':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 02:30:34 +00:00
Chris Craik
0c8aa8e8fb Merge "Reject transparent draws more conservatively" into lmp-dev 2014-09-23 02:24:50 +00:00
Dianne Hackborn
e2625fcce9 am 56a9f3ac: Merge "I am such an idiot." into lmp-dev 
* commit '56a9f3ac269c723895948bf524fe378a9afc6636':
  I am such an idiot.
 2014-09-23 02:20:28 +00:00
Vinit Deshpande
3f242a1aff Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 2014-09-23 02:17:08 +00:00
Lorenzo Colitti
1e2b63d91d Merge changes I3ebf0cec,I8635472c into lmp-dev 
* changes:
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 01:46:48 +00:00
Yuncheol Heo
f0f7f1b33d Merge "Fix the hotplug behaviors in TV." into lmp-mr1-dev 2014-09-23 01:44:11 +00:00
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Alan Viverette
c2e08a010e Update refresh icon to tinted material vector asset 
BUG: 17594602
Change-Id: I52f55580bfa22e335608cea0b1fcafe275752bf8
 2014-09-23 01:25:25 +00:00
Chris Craik
bc341912b1 Reject transparent draws more conservatively 
bug:17600162

Transparent draws are not safe to reject for all xfermodes other than
clear. Now, to be safe, only perform the rejection for SrcOver draws
since other modes are fairly uncommon.

We could specifically determine whether the xfermode could change the
output given a transparent input, but there's little to be gained from
the additional complexity.

Change-Id: Ia699ac4bdc4da3353955840b53f1922d3cb1d85d
 2014-09-23 01:22:00 +00:00
Amith Yamasani
fee7ad1619 Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 2014-09-23 01:09:11 +00:00
Yigit Boyar
6333c7e0a0 am 33e2fd32: am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '33e2fd325411e1c9a085aa9b2f2d1bb913ec1367':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 01:00:29 +00:00
Dianne Hackborn
c7437dd7c0 Merge "I am such an idiot." into lmp-dev 2014-09-23 00:57:28 +00:00
Yigit Boyar
79c89b86f5 am 35b32c80: Merge "Remove unnecessary waits in TouchUtil\'s drag" into lmp-dev 
* commit '35b32c8060fdd9eac9a1c62a07d554810a39e45c':
  Remove unnecessary waits in TouchUtil's drag
 2014-09-23 00:48:33 +00:00
Amit Mahajan
722c222b78 am 316c7729: am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '316c7729239118007204ab234068ef44f7aa0bc2':
  Don't disconnect data for some carrier
 2014-09-23 00:48:08 +00:00
Yigit Boyar
81d9304bda Merge "Remove unnecessary waits in TouchUtil's drag" into lmp-dev 2014-09-23 00:39:32 +00:00
Dianne Hackborn
4a1ef0b171 I am such an idiot. 
Seriously, don't look at this.  It is so dumb.

Brought up by issue #17307700: retarget a relinquished
task is not working

Change-Id: I947438d3502f75510e2974211bb78d31008eaa90
 2014-09-22 17:39:07 -07:00
Amit Mahajan
f6848fe8d4 am 4936c2c8: am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit '4936c2c831a2fe4dbc34343b81d9df9475d90895':
  Don't disconnect data for some carrier
 2014-09-23 00:35:29 +00:00
xinhe
6978c6bd3b am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'ec6b28c388cf5cae80b4c0892b6d3aee4fb0e63a':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:35:16 +00:00
Ruben Brunk
034242eb1c am c947ff9e: am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'c947ff9ed0508418e9b566e8fe8cf372f7ca3f2b':
  camera2: Docs update for available AF modes.
 2014-09-23 00:35:11 +00:00
Amit Mahajan
65811e94bf am e9259ce9: Merge "Don\'t disconnect data for some carrier" into lmp-dev 
* commit 'e9259ce9de43096ca1aaf24acb8fcb54c1f69583':
  Don't disconnect data for some carrier
 2014-09-23 00:24:22 +00:00
xinhe
48cc08eed5 am e66681ff: am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'e66681ff14548948e3905c77ff03ec546bdd23ce':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:23:28 +00:00
Ruben Brunk
4883dee074 am a34b25cc: am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit 'a34b25cc9274c1fa35110e2d937b257ac5d87003':
  camera2: Docs update for available AF modes.
 2014-09-23 00:23:24 +00:00
Ruben Brunk
1193c68232 am 6b68644e: am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '6b68644e04def4ee8fb664b430bfe0ee1074ed74':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:22:31 +00:00
Alan Viverette
d9759ae5ae am 8f7812bc: am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '8f7812bc780935edea623cce086069925816bdc8':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 00:22:27 +00:00
xinhe
f57086a38c am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-dev 
* commit 'f1524b5db229bc08b65df70e8da0e450d153cff3':
  Fix for empty RSSI triangle after boot
 2014-09-23 00:16:05 +00:00
Ruben Brunk
e48fcfb38f am 12f73fcf: Merge "camera2: Docs update for available AF modes." into lmp-dev 
* commit '12f73fcf874eccaea8e56a4ac547dc86ae9259a6':
  camera2: Docs update for available AF modes.
 2014-09-23 00:16:01 +00:00
Amit Mahajan
322582447e Merge "Don't disconnect data for some carrier" into lmp-dev 2014-09-23 00:15:31 +00:00
xinhe
abbc202431 Merge "Fix for empty RSSI triangle after boot" into lmp-dev 2014-09-23 00:13:22 +00:00
Ruben Brunk
52d62193d6 am e134e81a: am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit 'e134e81aa076acbd10551b3d39217e9d438b492d':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:11:03 +00:00
Alan Viverette
51fc9ea5cd am 20b9a6c4: am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '20b9a6c458f998d1a5d3896e859a65371db9fce2':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-23 00:10:59 +00:00
George Mount
f1abef6fc2 Force transitioning views to be visible when transition interrupted. 
Bug 17553034

When an Activity Transition was interrupted prior to starting the
enter transition, the views were not being made visible.

Override the return ActivityOptions if interrupted so that the
entering activity doesn't launch with a transition when coming
back from recents.

Change-Id: Id4e00c7bb138babfee4de71247a9df4431376e21
 2014-09-22 17:06:24 -07:00
Ruben Brunk
fcb086c8e7 Merge "camera2: Docs update for available AF modes." into lmp-dev 2014-09-23 00:06:15 +00:00
Ruben Brunk
75192fb790 am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev 
* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.
 2014-09-23 00:03:49 +00:00
Jing Zhao
2361b2d247 Don't disconnect data for some carrier 
In some network, deactivate PDP connection cause releasing of RRC connection,
which MM/IMSI detaching request needs. Without this detaching, network can
not release the network resources previously attached.
So we are avoiding data detaching on these networks.

Bug: 16207801
Change-Id: Ib2ccc04d67f313e1241872b17ab38416607b0b48
 2014-09-23 00:01:38 +00:00
Alan Viverette
60004caeba am 9e84a6a0: Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 
* commit '9e84a6a08b4ff50b745a6eaf35e52b9c7aef4c39':
  Fix inaccurate TypedArray.getDrawable() documentation
 2014-09-22 23:58:31 +00:00
Ruben Brunk
9343c3cb7f Merge "camera2: Add missing whitebalance mapping." into lmp-dev 2014-09-22 23:57:20 +00:00
Ruben Brunk
000555d32f am abe74255: am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit 'abe7425516933486c84e7009e65771ee3e86e6d5':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:52:47 +00:00
Adam Lesinski
e213d86d4b am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '6c7ca6f57c02d775f9ad588977a84abb8efd8a33':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-22 23:52:44 +00:00
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +00:00
Ruben Brunk
c50fb39328 am d782ce53: am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit 'd782ce534d57c69cb280313b89180dac742937a8':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:41:58 +00:00
Adam Lesinski
408f24da80 am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '7b7b7eb8929fbb0aa4729f3236a2f687fbb940df':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-22 23:41:54 +00:00
Ruben Brunk
524d16f7eb am 979c03a2: Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 
* commit '979c03a21bc346ddbfbfcf5d1d4239e5cdf30302':
  camera2: Avoid spurious IDLE transitions.
 2014-09-22 23:29:55 +00:00
Adam Lesinski
a8b449b8b5 am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 
* commit '390a3f459bf9ba6473f5ef93e4e37984980e1315':
  Revert behavior of Lockscreen Activity Launch to KK
 2014-09-22 23:29:51 +00:00
Vineeta Srivastava
e49c6ed019 am a8ee7910: am a9f4fadd: am cd938b83: Merge "AT&T short dialing code" into lmp-dev 
* commit 'a8ee7910c66749d0e3c15bf2abedcc5689f5d051':
  AT&T short dialing code
 2014-09-22 23:29:45 +00:00
John Reck
e3f815d432 am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '8434cfaf23cd9fa845ddb5f74fe22c5bfa22f14d':
  Aggressively trim memory for system_process
 2014-09-22 23:29:41 +00:00
Yuncheol Heo
b8d62e70bf Fix the hotplug behaviors in TV. 
- Don't run the local address allocation in the case of TV and the removed event.
- Let isTvDevice() return the value based on mLocalDevices, since tv() is
  unstable during the intialization period.

Bug: 17601460
Change-Id: Ic5701f1f86f51171960033bd97e169270a0021bf
 2014-09-23 08:28:23 +09:00
Jeff Vander Stoep
7bc601d5d7 Sanity-check paths of files to be restored 
(cherry picked from commit 7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug: 16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
 2014-09-22 23:21:20 +00:00
Alan Viverette
fde4e3b17a Fix inaccurate TypedArray.getDrawable() documentation 
The documentation implied that you could override
Resources.getDrawable(int) to load custom drawables, which is
not the case.

BUG: 16635905
Change-Id: I06c0febe2d6d4194ef5a31f167b378fe311b7a2d
 2014-09-22 16:19:51 -07:00
Ruben Brunk
c90b5ebbbf Merge "camera2: Avoid spurious IDLE transitions." into lmp-dev 2014-09-22 23:19:46 +00:00
Adam Lesinski
2e51cc6842 Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev 2014-09-22 23:17:47 +00:00