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

152482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
3caab56c21 am d08372bc: Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 
* commit 'd08372bc89eb0a1de3dee72a270b65b10701aad3':
  Fixed a bug where the alarm could overlap in QS
 2014-09-23 14:33:04 +00:00
Selim Cinek
0eba4e279f Merge "Fixed a bug where the alarm could overlap in QS" into lmp-dev 2014-09-23 14:25:09 +00:00
Adrian Roos
18321f5337 am b98fd933: Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 
* commit 'b98fd933fd7c5ca2c75849a013fc942ec211b5ee':
  Ensure that force lock works with accessibility enabled
 2014-09-23 14:00:27 +00:00
Adrian Roos
6ec76b0ff9 Merge "Ensure that force lock works with accessibility enabled" into lmp-dev 2014-09-23 13:48:42 +00:00
Selim Cinek
ba5b3a0b4e Fixed a bug where the alarm could overlap in QS 
When closing the QS panel the alarm did the normal
transformation, regardless whether we were in a
detail state. This lead to the alarm overlapping
with the title.

Bug: 17581501
Change-Id: I0318f6778063af11f388e6c7fe8bbb30105ca246
 2014-09-23 15:39:54 +02:00
Paul Jensen
7defcc8590 am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 
* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.
 2014-09-23 12:08:22 +00:00
Paul Jensen
74971c75dc Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev 2014-09-23 12:00:35 +00:00
Ricardo Cervera
d41c62041c am a4d80ca2: am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit 'a4d80ca26d32de6fa73910ed173b577218654cd3':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 03:48:45 +00:00
David Friedman
205c86eb66 am 1695d3de: am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '1695d3de3dad078eff55666cc182943e8f9fbfeb':
  Fixes two typos, one in each file.
 2014-09-23 03:48:40 +00:00
Chris Craik
15bb1d0385 am 737dfe57: Merge "Reject transparent draws more conservatively" into lmp-dev 
* commit '737dfe577e7f4198881e9b7ccf360a7f91ab736a':
  Reject transparent draws more conservatively
 2014-09-23 03:21:38 +00:00
Vinit Deshpande
5eab5e6899 am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '14f0aba327294f94d0f2c7f486b21c89aa2094f1':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 03:21:34 +00:00
Lorenzo Colitti
633b7bb8ed am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev 
* commit 'bb17a717750c558ece69344ecd93d96d4fbc4aca':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.
 2014-09-23 03:21:21 +00:00
Amith Yamasani
eccd4ed797 am 278cdb36: Merge "Fix regression in launching CantAddAccountActivity for correct user" into lmp-dev 
* commit '278cdb36bf99f6075af6e04a74c29a1701d21cff':
  Fix regression in launching CantAddAccountActivity for correct user
 2014-09-23 03:20:14 +00:00
Ricardo Cervera
acc0d6de53 am 44737ea5: am 4d0f84bb: am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '44737ea5e5a2f071ffc268f21556aa651a7637db':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-23 03:06:54 +00:00
David Friedman
086956839a am 8ec839c9: am 6bacce4f: am 8dcf1c32: Fixes two typos, one in each file. 
* commit '8ec839c95cb0020ee84f23ba65c4c95fb39ebd20':
  Fixes two typos, one in each file.
 2014-09-23 03:06:29 +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
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
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
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
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
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
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
Alan Viverette
53b5cc8773 Merge "Fix inaccurate TypedArray.getDrawable() documentation" into lmp-dev 2014-09-22 23:48:46 +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
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
Ruben Brunk
6f387098c2 camera2: Docs update for available AF modes. 
Bug: 17588783
Change-Id: If4010517e79b3a51bd6231424a10be672ff5a252
 2014-09-22 16:13:54 -07:00
Vineeta Srivastava
e2c975decc am cd938b83: Merge "AT&T short dialing code" into lmp-dev 
* commit 'cd938b83eac3ede61f82b9c62e9ac7c642e2e11c':
  AT&T short dialing code
 2014-09-22 23:10:42 +00:00
John Reck
6ed5ffebce am 668e566e: Merge "Aggressively trim memory for system_process" into lmp-dev 
* commit '668e566ec250a9548d6201c6190f80306e91dcce':
  Aggressively trim memory for system_process
 2014-09-22 23:10:37 +00:00
Vineeta Srivastava
4293d978d7 Merge "AT&T short dialing code" into lmp-dev 2014-09-22 23:05:50 +00:00
John Reck
c1dab7a201 Merge "Aggressively trim memory for system_process" into lmp-dev 2014-09-22 23:05:02 +00:00
Adam Lesinski
246a8bcadd Revert behavior of Lockscreen Activity Launch to KK 
There exists a lifecycle regression where launching an
app from the lockscreen (camera, etc.) causes a series
of onResume, onPause, onRestart, onStart, onResume.

This CL reverts the behavior to what it was in KK, which
is to say that the Launcher is first resumed/paused, then
the Activity being launched has a simple onRestart,onStart, onResume
lifecycle.

Bug:17459745
Change-Id: I04091d2f86a929ee972c8d6debc1beb033c135a8
 2014-09-22 16:04:32 -07:00
Jing Zhao
184f0871f6 AT&T short dialing code 
User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.

Bug: 17314389
Change-Id: I7132f08b633c6539dc0dd4e2d7865adcda795913
 2014-09-22 23:04:14 +00:00
John Reck
73840ea367 Aggressively trim memory for system_process 
Bug: 16978006

Don't HWUI-accelerate KeyguardScrim
Aggressively trim memory as soon as a ViewRootImpl
dies or has its visibility changed.

Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
 2014-09-22 16:01:56 -07:00
Ruben Brunk
72a23d7b50 camera2: Add missing whitebalance mapping. 
Bug: 17588192
Change-Id: I5d161dd22f2057a33a461157d678d4217a5f88f8
 2014-09-22 15:59:50 -07:00