Wale Ogunwale
fde6b69095
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717
...
am: f5a87d86bf
* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
Fixed bugs with starting windows when displayng forcedResized activity
Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
2016-05-17 01:10:44 +00:00
Wale Ogunwale
f5a87d86bf
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee
...
am: 33cffe3717
* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
Fixed bugs with starting windows when displayng forcedResized activity
Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
2016-05-17 01:05:00 +00:00
Wale Ogunwale
33cffe3717
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
...
am: b406dd20ee
* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
Fixed bugs with starting windows when displayng forcedResized activity
Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee
Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev
2016-05-17 00:51:41 +00:00
Jorim Jaggi
3a14fb7916
Handle multi-window for inset hint am: 23bf5462f0 am: b7bd18bdc6
...
am: bf9a7566df
* commit 'bf9a7566df02f7754ffeeba523cc904f73c0a45c':
Handle multi-window for inset hint
Change-Id: I033c6ad295bf235d181ad0fbfe5025cdcad5b4c2
2016-05-16 23:38:00 +00:00
Jorim Jaggi
bf9a7566df
Handle multi-window for inset hint am: 23bf5462f0
...
am: b7bd18bdc6
* commit 'b7bd18bdc67740aad7fd1fc4704dcf58857b4c58':
Handle multi-window for inset hint
Change-Id: I2434e83d0885551653f2a449c4a6194940f139b0
2016-05-16 23:32:21 +00:00
Wale Ogunwale
3b23239d6e
Fixed bugs with starting windows when displayng forcedResized activity
...
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.
Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
2016-05-16 16:27:01 -07:00
Jorim Jaggi
b7bd18bdc6
Handle multi-window for inset hint
...
am: 23bf5462f0
* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
Handle multi-window for inset hint
Change-Id: I6165730cf338d85f4e4a38d4115b9f4f299807b2
2016-05-16 23:26:53 +00:00
Jorim Jaggi
23bf5462f0
Handle multi-window for inset hint
...
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.
Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
2016-05-16 23:18:14 +00:00
Felipe Leme
708cf59ce6
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: b811d4ede8
...
am: 00463970fe
* commit '00463970fe2ac55533a763af8b565d76cb65b496':
Documented return value of getRestrictBackgroundStatus().
Change-Id: Ia86cbc0d7b0be02f7dad7446127c2c711bb9f771
2016-05-16 22:35:23 +00:00
Felipe Leme
00463970fe
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a
...
am: b811d4ede8
* commit 'b811d4ede8ca91d1118ccb44a290c0707a984c09':
Documented return value of getRestrictBackgroundStatus().
Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
2016-05-16 22:28:27 +00:00
Felipe Leme
b811d4ede8
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
...
am: 522787f39a
* commit '522787f39a759cf8af8438641fa8df7470a1b959':
Documented return value of getRestrictBackgroundStatus().
Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
2016-05-16 22:23:44 +00:00
TreeHugger Robot
522787f39a
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev
2016-05-16 22:17:42 +00:00
Vladislav Kaznacheev
f0c3721ac1
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 943c9f10d2
...
am: a19f5b640c
* commit 'a19f5b640c3713485c8813cb33f9a0f50d45a79c':
Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Change-Id: I5c964791ed64ff67dbc35dea23e40bd5b8801d03
2016-05-16 21:39:19 +00:00
Vladislav Kaznacheev
a19f5b640c
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac
...
am: 943c9f10d2
* commit '943c9f10d284acf5a5f927517fc7c283c473382e':
Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Change-Id: I6a35f83dcc11704dfbc983bd9004685ecc63b9b5
2016-05-16 21:31:10 +00:00
Vladislav Kaznacheev
943c9f10d2
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
...
am: a423ec52ac
* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
Change-Id: I8b704c0cf3b4df430b0f5a322e1cee008e67d113
2016-05-16 21:26:04 +00:00
TreeHugger Robot
a423ec52ac
Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev
2016-05-16 21:21:58 +00:00
Felipe Leme
c9c7be58a5
Documented return value of getRestrictBackgroundStatus().
...
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
2016-05-16 13:57:19 -07:00
Ta-wei Yen
655041ef5a
Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev
...
am: ca2da6dc33
* commit 'ca2da6dc3332bb657e4927b837e5bc15a6e119cb':
Add visual voicemail SMS filter APIs
Change-Id: I8b124c6a22e473f760e29be8d79843ec55122bb7
2016-05-16 20:43:01 +00:00
Ta-wei Yen
ca2da6dc33
Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev
2016-05-16 20:36:37 +00:00
Vladislav Kaznacheev
c244970220
Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.
...
Make getX/getY return view-relative position as specified in the class
JavaDoc.
Fix obvious errors in JavaDoc for getX/getY
Bug: 28793547
Change-Id: Ic2ac646189711e7466594d4fc8326408fc0348e1
2016-05-16 12:57:15 -07:00
Alan Viverette
b04a9f6595
Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4 am: 3818d32374
...
am: c46f3a4fe9
* commit 'c46f3a4fe98448b931ab2f933bd52cb7e51fa56d':
Update docs for ColorStateList to include alpha
Change-Id: Ic01d73f1173ed1836fd3a762db428b2af5b5c50a
2016-05-16 19:50:09 +00:00
Alan Viverette
1782b8e7db
Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b am: cee6b62ce8
...
am: a9c50001aa
* commit 'a9c50001aa0928f879d29c2dbbdd67591d510c47':
Use standalone capitalization for month labels
Change-Id: I34b06d007ffb330576278865cf7935e2f3f9cab6
2016-05-16 19:49:56 +00:00
Alan Viverette
c46f3a4fe9
Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650b4
...
am: 3818d32374
* commit '3818d32374374f568805a9a5eb7c4468aec78862':
Update docs for ColorStateList to include alpha
Change-Id: Ife972ac77358719a78c6ead2c2866e8de84e722e
2016-05-16 19:44:48 +00:00
Alan Viverette
a9c50001aa
Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b
...
am: cee6b62ce8
* commit 'cee6b62ce80b1c8f67cf18658768a94fef6e94da':
Use standalone capitalization for month labels
Change-Id: I2547ae9f4b21fe6be093023eb35f57c1b1eaff54
2016-05-16 19:44:46 +00:00
Alan Viverette
3818d32374
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
...
am: 5bcf7650b4
* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
Update docs for ColorStateList to include alpha
Change-Id: Ibb7c034061ec5c6b540e44ca856bed2624c14629
2016-05-16 19:40:47 +00:00
Alan Viverette
cee6b62ce8
Merge "Use standalone capitalization for month labels" into nyc-dev
...
am: 895241170b
* commit '895241170b017235faf9a6a77afd22b12209bce6':
Use standalone capitalization for month labels
Change-Id: I313042aaf507d5f4a23d3e261354d836b7bdfb0a
2016-05-16 19:40:37 +00:00
Alan Viverette
f10697e17b
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
...
am: 5bcf7650b4
* commit '5bcf7650b492ca9ce5b685c5e0f535b5927af0c6':
Update docs for ColorStateList to include alpha
Change-Id: I1dc16f964509cec422622da2ac60e5428b8203f6
2016-05-16 19:40:26 +00:00
Alan Viverette
97306713fe
Merge "Use standalone capitalization for month labels" into nyc-dev
...
am: 895241170b
* commit '895241170b017235faf9a6a77afd22b12209bce6':
Use standalone capitalization for month labels
Change-Id: I881afd0f2decf329e11e103c92dc54584b91ac54
2016-05-16 19:40:23 +00:00
Alan Viverette
5bcf7650b4
Merge "Update docs for ColorStateList to include alpha" into nyc-dev
2016-05-16 19:30:38 +00:00
Ta-wei Yen
349f4eddf7
Add visual voicemail SMS filter APIs
...
Added the following APIs to the framework:
VoicemailContracts.ACTION_VOICEMAIL_SMS_RECEIVED
VoicemailContracts.EXTRA_VOICEMAIL_SMS_TYPE
VoicemailContracts.EXTRA_VOICEMAIL_SMS_DATA
VoicemailContracts.EXTRA_VOICEMAIL_SMS_SUBID
TelphonyManager.setVisualVoicemailSmsFilterEnabled()
TelphonyManager.isVisualVoicemailSmsFilterEnabled()
TelphonyManager.setVisualVoicemailSmsFilterPrefix()
TelphonyManager.getVisualVoicemailSmsFilterPrefix()
TelphonyManager.setVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.getVisualVoicemailSmsFilterOriginatingNumbers()
TelphonyManager.setVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.getVisualVoicemailSmsFilterDestinationPort()
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_ANY
TelphonyManager.VVM_SMS_FILTER_DESTINATION_PORT_DATA_SMS
These values are required to implement the VisualVoicemailSmsFilter in
frameworks/opt/telephony
All of the APIs are hidden.
Bug:27816386
Bug:27817303
Change-Id: I07736785da5fece84d1f3d27f270ac6fa94c1c56
(cherry picked from commit ecbcce11ce )
2016-05-16 17:37:48 +00:00
Ta-wei Yen
31f9c9e758
Merge "Add visual voicemail SMS filter APIs"
2016-05-16 17:36:02 +00:00
Alan Viverette
c3e5a82691
Use standalone capitalization for month labels
...
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
2016-05-16 13:35:56 -04:00
Alan Viverette
582dcac856
Update docs for ColorStateList to include alpha
...
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
2016-05-16 12:37:55 -04:00
Yohei Yukawa
7e4ef1a319
Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5 am: a1c905caf3
...
am: c7aeaff113
* commit 'c7aeaff113ab3c525bab5ad79fce05ae895d93a7':
Make IMS#clearInsetOfPreviousIme() reliable.
Change-Id: I188b8ebb263d67c1bdcefcd4e9fedf390a199969
2016-05-16 15:37:39 +00:00
Yohei Yukawa
c7aeaff113
Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev am: cef3337cb5
...
am: a1c905caf3
* commit 'a1c905caf3fe89beec6df12b423c6cab33c40879':
Make IMS#clearInsetOfPreviousIme() reliable.
Change-Id: Ifbbbd96c2453a1aa6d933dda6fbd7ebbfdf132a7
2016-05-16 15:34:19 +00:00
Michael Wright
9f8c39a8e3
Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 am: 9e0ff89010
...
am: 56ef817f1e
* commit '56ef817f1e8805b6da304067a60a06b4fa86f995':
Remove onUhandledInputEvent API.
Change-Id: Ic0a52c81f611719e5bd8d51a141b48fa62ea8222
2016-05-16 15:31:12 +00:00
Yohei Yukawa
a1c905caf3
Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
...
am: cef3337cb5
* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
Make IMS#clearInsetOfPreviousIme() reliable.
Change-Id: I76b607cd8086f421fc0d552a348a70fc06aa3d9c
2016-05-16 15:31:05 +00:00
Yohei Yukawa
6b078fef33
Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
...
am: cef3337cb5
* commit 'cef3337cb5e27d4f571fb350be055c26d339833d':
Make IMS#clearInsetOfPreviousIme() reliable.
Change-Id: Ie654d6bccd6d4425e0dbefe2833424abdfe52a4d
2016-05-16 15:31:03 +00:00
Michael Wright
56ef817f1e
Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211
...
am: 9e0ff89010
* commit '9e0ff89010dd2003bc9952ffedcf0f6c8d080cbb':
Remove onUhandledInputEvent API.
Change-Id: I067333a191a5d581f397f5e9c09f6b7feae8d1f5
2016-05-16 15:27:37 +00:00
Michael Wright
9e0ff89010
Merge "Remove onUhandledInputEvent API." into nyc-dev
...
am: a1e4cbe211
* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
Remove onUhandledInputEvent API.
Change-Id: I13835ddbe40330694763d34d37e01b8deeb701d7
2016-05-16 15:24:10 +00:00
Michael Wright
eb1ca626f0
Merge "Remove onUhandledInputEvent API." into nyc-dev
...
am: a1e4cbe211
* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
Remove onUhandledInputEvent API.
Change-Id: I206665559c16852a6405af7081481c4e7c17cf81
2016-05-16 15:24:08 +00:00
Yohei Yukawa
cef3337cb5
Merge "Make IMS#clearInsetOfPreviousIme() reliable." into nyc-dev
2016-05-16 15:22:21 +00:00
Clara Bayarri
bec98ff68b
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: 8184f2e545
...
am: 8bccf39875
* commit '8bccf39875b479c6e09eab3b107817028d90c793':
Rename requestKeyboardShortcutsHelper
Change-Id: I83b36970bf652530797d7f383dbbbd090cd972ca
2016-05-16 15:18:36 +00:00
TreeHugger Robot
a1e4cbe211
Merge "Remove onUhandledInputEvent API." into nyc-dev
2016-05-16 15:18:20 +00:00
Clara Bayarri
8bccf39875
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e
...
am: 8184f2e545
* commit '8184f2e5452a8c5133da8c8d9ae957cf5182ce5a':
Rename requestKeyboardShortcutsHelper
Change-Id: I43fd7494218d2c1662bb3647671a0f02592ffc2d
2016-05-16 15:11:37 +00:00
Clara Bayarri
8184f2e545
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
...
am: d34396443e
* commit 'd34396443e712a96572d26c820809a9485e57da3':
Rename requestKeyboardShortcutsHelper
Change-Id: I0522d4d9bcfdce6b79dc672dcc0c515dc747b99d
2016-05-16 15:08:15 +00:00
Clara Bayarri
f76e417c52
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
...
am: d34396443e
* commit 'd34396443e712a96572d26c820809a9485e57da3':
Rename requestKeyboardShortcutsHelper
Change-Id: I6fb4ae2c7b39b24fb4b9c916552bd9fb4534f546
2016-05-16 15:08:09 +00:00
Clara Bayarri
ac6f034f2a
Rename requestKeyboardShortcutsHelper
...
Per API council feedback
Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Narayan Kamath
9782056f16
LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 150664c275
...
am: 9bfcf64542
* commit '9bfcf6454267deb29a517f20e9df9700a4c788cc':
LoadedApk: Avoid unnecessary work when mIncludeCode == false.
Change-Id: I12d74bc35989d5e1a28481531b12d0ef882ab29e
2016-05-16 10:51:43 +00:00