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

158952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
0bc1eee096 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev 
automerge: b724314

* commit 'b724314516dc15ab7afb62f7a6e63d94f4022011':
  Reduce number of saveLayer calls in RippleDrawable
 2014-11-12 02:26:04 +00:00
vandwalle
39c5118037 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 
automerge: 3f558e7

* commit '3f558e7285d8632b81cde4a9f1d0829e02be5fa0':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 02:24:40 +00:00
Wink Saville
e76308c5d6 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 43bbf30

* commit '43bbf30a06a2aee05db9b80b287672017fbada5c':
  Update SubscriptionManager API as per API council.
 2014-11-12 02:23:03 +00:00
Alan Viverette
b724314516 Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev 2014-11-12 02:04:22 +00:00
Bryce Lee
70532bf464 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 
automerge: 5c14bc2

* commit '5c14bc213be3e311c150b7cb86dc880937b3b7b7':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
 2014-11-12 01:21:13 +00:00
Winson Chung
1314e9a259 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev 
automerge: 4ff2526

* commit '4ff2526ef8d168d3c591f1a19de4dca76745c157':
  Adding null checks for unset stack. (Bug 18329447)
 2014-11-12 01:20:15 +00:00
vandwalle
3f558e7285 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:10 +00:00
Craig Mautner
2b9e9f417f Show error dialogs over apps that dismiss keyguard 
automerge: c08eab8

* commit 'c08eab81f30a3120ec0929d3508b4a78d498e1ff':
  Show error dialogs over apps that dismiss keyguard
 2014-11-12 01:17:48 +00:00
Winson Chung
6a601c9ee8 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
automerge: 147de3a

* commit '147de3a9766e205af068d1462beaea7a4a9fb9bc':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
 2014-11-12 01:16:47 +00:00
Amith Yamasani
15de62de26 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 
automerge: 93ffd5d

* commit '93ffd5dc0a243af87f8ba106fe98df7a7ed2c484':
  Allow profile owners to set the unknown source setting
 2014-11-12 01:15:16 +00:00
Junda Liu
5716ebe50d Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 
automerge: 2eb5a5f

* commit '2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 01:14:00 +00:00
Wink Saville
43bbf30a06 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-12 01:13:04 +00:00
Bryce Lee
5c14bc213b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 
automerge: 68f9773

* commit '68f97736e65f1be4664fd3c3765fc621f3b76c3a':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.
 2014-11-12 01:02:49 +00:00
Winson Chung
4ff2526ef8 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev 2014-11-12 00:35:37 +00:00
Craig Mautner
c08eab81f3 Show error dialogs over apps that dismiss keyguard 
Error dialogs absorb all input to ensure that they are not missed.
This can cause the screen to lock up if they are not displayed but
are still absorbing touches. This was what was happening when there
was an error dialog up at the same time as a phone call came in as
in b/17648830.

This fix recognizes when an app is dismissing the keyguard and
forces any error dialogs to be shown over such an app.

This also removes the private flags from the input system as they
are no longer needed.

Fixes bug 17648830.

Change-Id: I5c98b8265a1448b445fdb2f745fc78892f8656a4
 2014-11-11 16:22:56 -08:00
Winson Chung
4ee0eb3c46 Adding null checks for unset stack. (Bug 18329447) 2014-11-11 16:11:52 -08:00
Winson Chung
147de3a976 Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-11-12 00:10:55 +00:00
Winson Chung
a91c293be2 Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345) 
This change ensures that only the number of visible thumbnails and task icons are
loaded to minimize the delay required when initializing the stack without the 
cache.  In addition, this change reduces the number of times that the task stack
is recomposed when launching recents (in addition to the number of calls to 
getRecentTasks()).

There is also a fix to a regression where the exit trigger is not run when the
task stack view is empty.

Change-Id: I75834ff3c57c0e5dad6252b982f71c6e740071f2
 2014-11-11 16:10:05 -08:00
Amith Yamasani
93ffd5dc0a Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev 2014-11-12 00:07:59 +00:00
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Bryce Lee
68f97736e6 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 2014-11-11 23:59:34 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting 
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
 2014-11-11 23:38:24 +00:00
Ihab Awad
cf9248cbf5 am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit '9114a845d9474bc2ecc807c3f195fe0c5314556c':
  Update PhoneAccount icon API (1/6)
 2014-11-11 23:02:22 +00:00
Ihab Awad
9114a845d9 Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 2014-11-11 22:56:08 +00:00
Jeff Brown
c1275e72ec am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
* commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9':
  Move device admin max screen off timeout to internal interface.
 2014-11-11 22:48:23 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Ihab Awad
476cc83558 Update PhoneAccount icon API (1/6) 
Responding to comments by jeffbrown@ in http://ag/574833

Bug: 18291787

Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
 2014-11-11 13:18:49 -08:00
Adam Lesinski
1e2e05bf8c am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
* commit 'da772234f6f9498bf02f31448bda16e9fcbd6bd2':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 20:26:24 +00:00
Chris Wren
56c1037767 am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 
* commit 'aeca1baf656ac5197db345db6b890a5c5e4719b0':
  Add event logs when we launch fullscreen notications.
 2014-11-11 20:26:19 +00:00
Adam Lesinski
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +00:00
Chris Wren
aeca1baf65 Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 2014-11-11 20:21:59 +00:00
Prabhakar Thirumoorthy
d476bfd01b am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev 
* commit '2cc8043cad4c51aeffd5650b669b15e93fb980d5':
  If task isn't found in recents, look in the stacks.
 2014-11-11 20:05:20 +00:00
Prabhakar Thirumoorthy
2cc8043cad Merge "If task isn't found in recents, look in the stacks." into lmp-mr1-dev 2014-11-11 20:01:10 +00:00
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 11:48:04 -08:00
Craig Mautner
e042bf2b22 If task isn't found in recents, look in the stacks. 
It may take an attach to move a task into the recents list. If the
timing is right a task may not be in recents by the time we are
removing it from the stacks due to a finish. In that case we should
look in the stacks for the task as well as looking in recents.

Fixes bug 18017409.

Change-Id: Idcfe2e263c9d0fe9a063fdf22515ac4e7fe89ecb
 2014-11-11 11:28:43 -08:00
Chong Zhang
6610985c35 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 
* commit '00795e9edda7038022d8f1268ca3304165076d2e':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:38:04 +00:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Pavel Zhamaitsiak
5ff25cb76c am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
* commit '7635aab10b44773d599ef8229a967fdf99d2817a':
  IMS: Peer capabilities support
 2014-11-11 18:11:45 +00:00
Chris Wren
223c66b681 Add event logs when we launch fullscreen notications. 
When the heads up does not trigger on enqueue, and also when a heads up
is escalated to a fullscreen on a screen event.

Bug: 16644299
Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da
 2014-11-11 18:11:25 +00:00
Pavel Zhamaitsiak
7635aab10b Merge "IMS: Peer capabilities support" into lmp-mr1-dev 2014-11-11 18:07:06 +00:00
Wale Ogunwale
4937d95aa4 am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 
* commit '285970cfeae3b175699b038f51c0f9b012a95d0e':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:03:04 +00:00
Wale Ogunwale
285970cfea Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 2014-11-11 18:00:06 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Deepanshu Gupta
8f6e7a868c am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '7ed525bf92749113a177815ffce5d6545bd59314':
  Don't skip loading object animator.
 2014-11-11 17:26:17 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
a44fdb9e21 Merge "Don't skip loading object animator." into lmp-dev 2014-11-11 17:11:24 +00:00
John Spurlock
3069aa2057 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 
* commit '73546e535925e6c2902cba10d9da962ba6b39d5f':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 16:56:37 +00:00
John Spurlock
73546e5359 Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 2014-11-11 16:50:15 +00:00