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

172960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart Scott
e2b9d5b56c am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-14 21:40:06 +00:00
Stuart Scott
542f4ee619 am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 
* commit 'a2fa3d219bc148c196b0eb3cf7b3b1bd453e830b':
  Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
 2015-01-14 21:33:35 +00:00
Michael Wright
31572ede1c am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '5497e99c4a749a46b8e9f8312d01639987ba81a0':
  Clean up graphics resources.
 2015-01-14 21:32:37 +00:00
Stuart Scott
a2fa3d219b Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev 2015-01-14 21:28:54 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
 2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Craig Mautner
c626773562 am f387d3c8: am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev 
* commit 'f387d3c87a1730605726c48c7b2c2355b50f4935':
  Place window at top when adding by base layer
 2015-01-14 20:58:12 +00:00
Craig Mautner
f387d3c87a am c8ba2e87: Merge "Place window at top when adding by base layer" into lmp-mr1-dev 
* commit 'c8ba2e87a40eb70ad22c62b9768e7691e3ff3bc3':
  Place window at top when adding by base layer
 2015-01-14 20:52:23 +00:00
Adam Lesinski
5c61dfc25f am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit 'e488ce8668538b45c586eba21f5bca288d749686':
  AAPT: Handle all old unversioned attribute usage
 2015-01-14 20:47:47 +00:00
Craig Mautner
c8ba2e87a4 Merge "Place window at top when adding by base layer" into lmp-mr1-dev 2015-01-14 20:46:23 +00:00
Adam Lesinski
e488ce8668 am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit '94e30215f97157500d5f5ca1cec446c7114f54b0':
  AAPT: Handle all old unversioned attribute usage
 2015-01-14 20:40:42 +00:00
Adam Lesinski
94e30215f9 Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 2015-01-14 20:22:30 +00:00
Craig Mautner
cfb13798db Place window at top when adding by base layer 
When addAppWindowToListLocked defaults to adding based on mBaseLayer
it went from the lowest window to the highest window looking for a
window whose base layer was larger and dropping the new window below
that window.

If the Home activity is the InputMethodTarget then when the home
ActivityStack moves to the back the InputMethod will follow. This
puts the InputMethod, with it's high base layer value below most
activities. If a new activity window is added using the mBaseLayer
rule above it was placed at the bottom of the window list below the
InputMethod window. Being at the bottom it never received focus and
input to the activity timed out causing ANR.

This change starts the mBaseLayer search at the top window and works
its way down looking for the first window whose mBaseLayer is less
than or equal to the new window's mBaseLayer and inserting the new
window above that window. This causes it to be placed at the top of
all activities even if the InputMethod is near the bottom.

Fixes bug 17721767.

Change-Id: I037064de7604b670841e985479eb5857b47af1d7
 2015-01-14 12:20:35 -08:00
Stuart Scott
400a3f6df2 Unhide getDataRoaming, Messenger uses it to decide to download MMS or not. 
bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
 2015-01-14 12:12:02 -08:00
Adam Lesinski
28994d8d18 AAPT: Handle all old unversioned attribute usage 
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
 2015-01-14 12:02:15 -08:00
Christoph Studer
4d5e761a34 am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit 'a80da9d069ba3db60b9b43b4e10294a1700e9ca5':
  SysUI: Log lockscreen gestures
 2015-01-14 19:24:42 +00:00
Jorim Jaggi
87f536948c am c1691e3f: am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit 'c1691e3f8b148bc0a986fa7d4c4bfaee56c6442c':
  Only notify SIM state changes when it has actually changed
 2015-01-14 19:24:36 +00:00
Christoph Studer
f4e943e8a6 am 2d26435f: am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit '2d26435f0e8a46f3653fb6f25dbfd92d90b8d80e':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 19:24:30 +00:00
Nicolas Prevot
f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 19:24:16 +00:00
Paul Jensen
5fab6ad326 am be61ffa4: am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 
* commit 'be61ffa4fe42b4e6fdb677c7b1aeefb43ad3ef9f':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
 2015-01-14 19:24:09 +00:00
Christoph Studer
a80da9d069 am b018399a: SysUI: Log lockscreen gestures 
* commit 'b018399a3a2762e95126acbe14397eca15bad772':
  SysUI: Log lockscreen gestures
 2015-01-14 15:27:02 +00:00
Jorim Jaggi
c1691e3f8b am 86e1788d: Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 
* commit '86e1788db46cdbcc65331dd8d0b9e23241a534fe':
  Only notify SIM state changes when it has actually changed
 2015-01-14 15:16:12 +00:00
Christoph Studer
2d26435f0e am bd0db7b1: Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 
* commit 'bd0db7b18f2a78b2ac2ff13234bf5b3582c9aec4':
  SysUI: Log lockscreen state to eventlog
 2015-01-14 15:16:07 +00:00
Christoph Studer
b018399a3a SysUI: Log lockscreen gestures 
Log the following lockscreen gestures:
 * Swipe up to unlock
 * Swipe down to enter full shade
 * Tap in empty area (causing unlock hint)
 * Swipe to camera
 * Swipe to dialer
 * Tap on lock to lock device
 * Tap on notification, activating it

For swipe gestures, includes length and velocity where available.

Bug: 18767135
Change-Id: Ib2c535e3a9d2b378f5a2a0a00c2be3fd916554ac
 2015-01-14 15:15:58 +00:00
Jorim Jaggi
86e1788db4 Merge "Only notify SIM state changes when it has actually changed" into lmp-mr1-dev 2015-01-14 15:13:09 +00:00
Christoph Studer
bd0db7b18f Merge "SysUI: Log lockscreen state to eventlog" into lmp-mr1-dev 2015-01-14 15:10:53 +00:00
Nicolas Prevot
206d31f598 am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 13:38:21 +00:00
Nicolas Prevot
42ebaa434f Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 2015-01-14 13:33:13 +00:00
Paul Jensen
be61ffa4fe am 9f0e9ad4: Merge "Don\'t blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 
* commit '9f0e9ad40633f0480c8b6209e52d61c5aac52d1d':
  Don't blindly teardown unvalidated networks when releasing NetworkRequests.
 2015-01-14 12:42:32 +00:00
Paul Jensen
9f0e9ad406 Merge "Don't blindly teardown unvalidated networks when releasing NetworkRequests." into lmp-mr1-dev 2015-01-14 12:39:01 +00:00
Lorenzo Colitti
51d281ee41 am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '792fd3d1eea0d4e1c69480684cf3be4e4c215ace':
  Switch the connectivity check to its own hostname.
 2015-01-14 12:06:31 +00:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
 2015-01-14 12:06:22 +00:00
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
 2015-01-14 11:59:46 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
 2015-01-14 11:59:41 +00:00
Nicolas Prevot
2c1c5dd5ef Make documentation for cross-profile intent filters clearer. 
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
 2015-01-14 10:31:23 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Junda Liu
427e7162ca am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:17:58 +00:00
Junda Liu
ead0184548 am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit '6e41019633975358cf2f84c5d1e09e6e3a049875':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:09:53 +00:00
Junda Liu
6e41019633 Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 2015-01-14 00:06:19 +00:00
Justin Harrison
4a7b0062a1 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 
automerge: 561cf95

* commit '561cf9595547581e0cc905ed5a05023bf67ca0b8':
  Fix unexpected language changes on SIM card insertion.
 2015-01-13 23:26:23 +00:00
Eric Laurent
e5a25a7689 am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 
automerge: 50085fb

* commit '50085fbccfd08038ba5ec888621d960dbbe21405':
  AudioService: handle stream mute by stream alias
 2015-01-13 23:25:05 +00:00
Stuart Scott
2d68b428b0 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:23:20 +00:00
Fyodor Kupolov
f8db59de22 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 
automerge: 562e87b

* commit '562e87bdd5eb58a97cce2224c36443f8915fa7d8':
  Run isKeyguardSecure under system privileges
 2015-01-13 23:21:43 +00:00
Justin Harrison
561cf95955 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 
* commit '820088587e732fe04b705248a06f275bf264be33':
  Fix unexpected language changes on SIM card insertion.
 2015-01-13 23:15:14 +00:00
Eric Laurent
50085fbccf am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 
* commit 'ad58ca67c6e3a999357f0d4df8daa9fbbe1a2903':
  AudioService: handle stream mute by stream alias
 2015-01-13 23:15:09 +00:00
Stuart Scott
dfb99e8274 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
* commit 'e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:15:03 +00:00
Fyodor Kupolov
562e87bdd5 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 
* commit '207d7bd3a4aca3478910ec740a0c810868fbeabb':
  Run isKeyguardSecure under system privileges
 2015-01-13 23:14:58 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname. 
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
 2015-01-14 08:06:56 +09:00
Justin Harrison
820088587e Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 2015-01-13 23:01:39 +00:00