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

173171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
07bb922566 Import translations. DO NOT MERGE 
Change-Id: Id86b88b56be5979b6e4e28855ba33f178f032b2e
Auto-generated-cl: translation import
 2014-11-12 09:06:31 -08:00
Wink Saville
f78c50e6da am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c 
* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:45:30 +00:00
Bryce Lee
1c53c20c27 am 358d1906: 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 automerge: 70532bf 
* commit '358d19065b0e32ee4d48f26477cf917856e46359':
  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 03:45:20 +00:00
Winson Chung
57e0d099fb am d7b557fb: Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev automerge: 4ff2526 automerge: 1314e9a 
* commit 'd7b557fb288c911bffd06f24923f16cc0e80153e':
  Adding null checks for unset stack. (Bug 18329447)
 2014-11-12 03:45:16 +00:00
Craig Mautner
ec36c2401d am b39f5510: Show error dialogs over apps that dismiss keyguard automerge: c08eab8 automerge: 2b9e9f4 
* commit 'b39f5510f4285f10e9071987eb2d484e0ff4a58b':
  Show error dialogs over apps that dismiss keyguard
 2014-11-12 03:45:01 +00:00
Winson Chung
b31ac7e17f am 9922539f: Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev automerge: 147de3a automerge: 6a601c9 
* commit '9922539facdc52124f9329969c74dcc7b39c8161':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
 2014-11-12 03:44:56 +00:00
Amith Yamasani
7c2f242230 am e73cab5f: Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d automerge: 15de62d 
* commit 'e73cab5f1226f7434fa8bbf341e91891916683c5':
  Allow profile owners to set the unknown source setting
 2014-11-12 03:44:49 +00:00
Junda Liu
5b7dbca7ca am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe 
* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:44:44 +00:00
Elliott Hughes
46c84d87e7 am 5b6683c0: am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder" 
* commit '5b6683c04a56548dbc041dda0a66a2b67444f634':
  Prevent resource leak in YuvToJpegEncoder
 2014-11-12 03:44:18 +00:00
Andreas Gampe
5dcc254210 am 6f4c0f8e: am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator" 
* commit '6f4c0f8e9f07dc67cd72f9613cb6d72b9edb7f86':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 03:44:14 +00:00
Elliott Hughes
38aa961b27 am 2fa1e486: am 7c4ef052: Merge "Fix for CharSequenceCreator test case" 
* commit '2fa1e48692e9bc29b81b0333e8b3742a1eb85206':
  Fix for CharSequenceCreator test case
 2014-11-12 03:44:10 +00:00
Andreas Gampe
253194ab1f am dbf16c6f: am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI" 
* commit 'dbf16c6fa0d1ab4e8bc8f3ca61ae4b0ce5d38a8f':
  Frameworks/base: Fix FingerprintManager JNI
 2014-11-12 03:44:05 +00:00
Andreas Gampe
9711765c8c am a156c5a6: am 316e75fe: Merge "Frameworks/base: Wall Werror in rs" 
* commit 'a156c5a60cd67390bfe76ddb80045ce23635a0f5':
  Frameworks/base: Wall Werror in rs
 2014-11-12 03:44:00 +00:00
Wink Saville
93fc415e62 Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 
automerge: e76308c

* commit 'e76308c5d62984132192119f3d0bc407f89a2100':
  Update SubscriptionManager API as per API council.
 2014-11-12 03:22:11 +00:00
Bryce Lee
358d19065b 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 
automerge: 70532bf

* commit '70532bf46433519a27ecada265b6de9364f51f39':
  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 03:19:50 +00:00
Winson Chung
d7b557fb28 Merge "Adding null checks for unset stack. (Bug 18329447)" into lmp-mr1-dev automerge: 4ff2526 
automerge: 1314e9a

* commit '1314e9a25921e7b87fc94db46e690b07d446237d':
  Adding null checks for unset stack. (Bug 18329447)
 2014-11-12 03:18:47 +00:00
Craig Mautner
b39f5510f4 Show error dialogs over apps that dismiss keyguard automerge: c08eab8 
automerge: 2b9e9f4

* commit '2b9e9f417f88ff385b37f01257748b050e505eb6':
  Show error dialogs over apps that dismiss keyguard
 2014-11-12 03:16:39 +00:00
Winson Chung
9922539fac Merge "Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev automerge: 147de3a 
automerge: 6a601c9

* commit '6a601c9ee8cee46680417dc450e9bb64c86a1b09':
  Preload only visible thumbnails and task icons. (Bug 17672056, Bug 18291345)
 2014-11-12 03:15:25 +00:00
Amith Yamasani
e73cab5f12 Merge "Allow profile owners to set the unknown source setting" into lmp-mr1-dev automerge: 93ffd5d 
automerge: 15de62d

* commit '15de62de26a3ef936a219daf65ec5d388197a9fc':
  Allow profile owners to set the unknown source setting
 2014-11-12 03:13:59 +00:00
Junda Liu
829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f 
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
 2014-11-12 03:12:51 +00:00
Elliott Hughes
5b6683c04a am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder" 
* commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417':
  Prevent resource leak in YuvToJpegEncoder
 2014-11-12 02:53:35 +00:00
Andreas Gampe
6f4c0f8e9f am bc0b57f3: Merge "Frameworks/base: Right transform in DngCreator" 
* commit 'bc0b57f3366420d7a634d5ef2bc6d9acaf55e7bf':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 02:53:28 +00:00
Elliott Hughes
2fa1e48692 am 7c4ef052: Merge "Fix for CharSequenceCreator test case" 
* commit '7c4ef052d521d5ccf8acfb03c9332b59ea737cea':
  Fix for CharSequenceCreator test case
 2014-11-12 02:53:22 +00:00
Andreas Gampe
dbf16c6fa0 am db387066: Merge "Frameworks/base: Fix FingerprintManager JNI" 
* commit 'db387066037bc6892331a5c7ea52a85d416acdaa':
  Frameworks/base: Fix FingerprintManager JNI
 2014-11-12 02:53:17 +00:00
Andreas Gampe
a156c5a60c am 316e75fe: Merge "Frameworks/base: Wall Werror in rs" 
* commit '316e75fee668c0bbf095ea8124946c5c4d396880':
  Frameworks/base: Wall Werror in rs
 2014-11-12 02:53:07 +00:00
Paul Soulos
f6899c8d48 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: f20aeaa

* commit 'f20aeaa0333ee9d550adbad4c9e901d3db0bd48c':
 2014-11-12 02:51:41 +00:00
Ihab Awad
ba595fad5a am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
automerge: e323ff0

* commit 'e323ff0653b07bca0c665be8f3fc5415e27bd2c7':
  Update PhoneAccount icon API (1/6)
 2014-11-12 02:48:29 +00:00
Jeff Brown
70170261cb am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev automerge: c1275e7 
automerge: a473878

* commit 'a4738781584d58e133fc4d0f55d9b7ebcb246ff6':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 02:46:10 +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
Elliott Hughes
34acb4c8d4 Merge "Prevent resource leak in YuvToJpegEncoder" 2014-11-12 01:45:42 +00:00
Andreas Gampe
bc0b57f336 Merge "Frameworks/base: Right transform in DngCreator" 2014-11-12 01:44:30 +00:00
Elliott Hughes
7c4ef052d5 Merge "Fix for CharSequenceCreator test case" 2014-11-12 01:38:58 +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
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
Paul Soulos
f20aeaa033 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2014-11-12 00:30:41 +00:00
Ihab Awad
e323ff0653 am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit 'cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02':
  Update PhoneAccount icon API (1/6)
 2014-11-12 00:28:26 +00:00
Ihab Awad
8c5f5fbdff am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
automerge: cf9248c

* commit 'cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02':
  Update PhoneAccount icon API (1/6)
 2014-11-12 00:27:21 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 00:24:43 +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