Commit Graph

254385 Commits

Author SHA1 Message Date
Amith Yamasani
c562b7886e Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe
am: 9db4384118

* commit '9db4384118911abd55ee528e570707be2af3f85b':
  Allow Shell to change component enabled state

Change-Id: I9a309ea4fb46925de793b339896629ca43cb053f
2016-05-17 00:42:43 +00:00
Wei Jia
838a4ed101 android_media_MediaSync: Do not pass NULL to AString ctor.
Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
2016-05-16 17:40:02 -07:00
Wale Ogunwale
245d5580aa Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I2211b2a8eb03a692bdbc6124f0103340c39c4adc
2016-05-17 00:38:50 +00:00
Wale Ogunwale
52ccdf05d7 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5f121bb48513d054f53d17bd7a1030adb59d2a2e
2016-05-17 00:37:47 +00:00
Amith Yamasani
9db4384118 Merge "Allow Shell to change component enabled state" into nyc-dev
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I964e0aebb669adf368524454e2ca681784e8e67b
2016-05-17 00:34:30 +00:00
Amith Yamasani
0250ae2c1b Merge "Allow Shell to change component enabled state" into nyc-dev
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I8b472bf3149b1e721ea90a8a6fed12549e3f1510
2016-05-17 00:34:16 +00:00
TreeHugger Robot
fc932b9d69 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 2016-05-17 00:29:04 +00:00
Amith Yamasani
19b34eccfe Merge "Allow Shell to change component enabled state" into nyc-dev 2016-05-17 00:27:55 +00:00
Android Build Merger (Role)
cde1df9222 Merge "Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: fa3e66e0ae" into nyc-mr1-dev-plus-aosp 2016-05-17 00:13:23 +00:00
Chris Craik
60309d64e2 Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5
am: fa3e66e0ae

* commit 'fa3e66e0aef5b4868a554fcebcaba502426cbe89':
  Fix hw layer overdraw/update visualization

Change-Id: Ib2f1a4d6f8584ce9c25da0c810622b5e11c1f921
2016-05-17 00:13:01 +00:00
Chris Craik
f075b05d5a Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5
am: bd2edfca03

* commit 'bd2edfca03bf09143a941c3859c4fbd3f8115aba':
  Fix hw layer overdraw/update visualization

Change-Id: I0ffbf7cd8d1495cd131a4b610a3210f38458610e
2016-05-17 00:12:48 +00:00
Chris Craik
bd2edfca03 Merge "Fix hw layer overdraw/update visualization" into nyc-dev
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: Ic4c49b25e0d1709d34974adb828c3ab4644415e5
2016-05-17 00:08:14 +00:00
Chris Craik
fa3e66e0ae Merge "Fix hw layer overdraw/update visualization" into nyc-dev
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: I4e788e8a83fa02881ca18d82dc2371d5bf43284c
2016-05-17 00:07:54 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Jorim Jaggi
2c4eddbc4a Handle multi-window for inset hint am: 23bf5462f0
am: 4958217aa4

* commit '4958217aa4110109bd18eb4da10cd90535afd365':

Change-Id: I7ec24ff246b2222693c8ce951e7b936b9573af6f
2016-05-16 23:37:41 +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
Tim Murray
6831611aa1 Merge "Make persistent apps become top correctly." into nyc-dev am: 29af3cab29
am: b9e8a87240

* commit 'b9e8a87240c7abc3bb65fb7d6e58bddc278ee9b9':

Change-Id: Ib1648b07c1b215a3738fafa689b99b8dbfd46ccc
2016-05-16 23:29:32 +00:00
Jorim Jaggi
4958217aa4 Handle multi-window for inset hint
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
2016-05-16 23:27:56 +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
Makoto Onuki
20c95f854e ShortcutManager: API changes for DR
See https://goto.google.com/shortcutmanager-spec-dr for
the details.

This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.

- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts.  ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
  -> When launcher fetches shortcuts, ShortcutService will
  automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.

- ShortcutInfo.weight is replaced with "rank".

- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.

Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168

Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
2016-05-16 16:25:50 -07:00
Tim Murray
0f6d5f8a04 Merge "Make persistent apps become top correctly." into nyc-dev am: 29af3cab29
am: 03a357f8e9

* commit '03a357f8e950aa60c67195844e6e382f0ad4b3b8':
  Make persistent apps become top correctly.

Change-Id: I4164ac2d6eaebf845f00a493187986ca9687fe7b
2016-05-16 23:25:03 +00:00
Tim Murray
b9e8a87240 Merge "Make persistent apps become top correctly." into nyc-dev
am: 29af3cab29

* commit '29af3cab293dc7a19ca3b387c5507e521f66d0b7':
  Make persistent apps become top correctly.

Change-Id: Ic022afa3fa2004735b371dce4738da8d7dfeb008
2016-05-16 23:22:39 +00:00
Tim Murray
03a357f8e9 Merge "Make persistent apps become top correctly." into nyc-dev
am: 29af3cab29

* commit '29af3cab293dc7a19ca3b387c5507e521f66d0b7':
  Make persistent apps become top correctly.

Change-Id: I3cce5f530659bf2355f79ebcd323ab79137aec92
2016-05-16 23:20:06 +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
Wale Ogunwale
db0fa12b73 Update configuration of all visible activities in a stack when resizing
Previously we were only updating configuration for the top activity in
the stack during resizing. This caused an activity behind the top
translucent activity to continue to display in the old configuration
and also get relaunched without window preservation when the top
translucent activity is finished.
We now make sure all activities at all below a translucent activity
have their configuration updated during resizing.

Bug: 28762547
Change-Id: I0926ac6db088cdf3f6a225c552dbfbe944830f68
2016-05-16 16:14:33 -07:00
TreeHugger Robot
29af3cab29 Merge "Make persistent apps become top correctly." into nyc-dev 2016-05-16 23:13:25 +00:00
Android Build Merger (Role)
eb51b86aa1 Merge "Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev am: 91dd6209f8" into nyc-mr1-dev-plus-aosp 2016-05-16 23:07:26 +00:00
Android Build Merger (Role)
84ea1608c4 Merge "Merge "Clear more native pointers in finalizers" into nyc-dev am: 53c33d9701 am: eb714f3d29" into nyc-mr1-dev-plus-aosp 2016-05-16 23:07:16 +00:00
Anthony Hugh
2d9df20218 Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev
am: 91dd6209f8

* commit '91dd6209f8029d709d097cfded2ec379c7e00688':
  Change Priority Only mode defaults on watches

Change-Id: I855b9bff86634338c1a015d67317f5a1c27bcb6e
2016-05-16 23:06:41 +00:00
Hans Boehm
55f23de8c1 Merge "Clear more native pointers in finalizers" into nyc-dev am: 53c33d9701
am: eb714f3d29

* commit 'eb714f3d29a874ea3a205d44acbbcc4c1f589c13':
  Clear more native pointers in finalizers

Change-Id: I605858ac14ab9a93e5dcda6aa58bb6a9a28a1507
2016-05-16 23:06:30 +00:00
Hans Boehm
7dcd190595 Merge "Clear more native pointers in finalizers" into nyc-dev am: 53c33d9701
am: 41ffbd36ed

* commit '41ffbd36ed1e1801865c4b5a25a6879423909a19':
  Clear more native pointers in finalizers

Change-Id: I2c1e3a29ef39ebf87bc8f80230e34232591c6f34
2016-05-16 23:06:27 +00:00
Hans Boehm
41ffbd36ed Merge "Clear more native pointers in finalizers" into nyc-dev
am: 53c33d9701

* commit '53c33d97013ad10a42d9b37fe77884f596250109':
  Clear more native pointers in finalizers

Change-Id: I01a8c087db241ecedd4986d0e859cb33e298b86c
2016-05-16 23:02:20 +00:00
Anthony Hugh
91dd6209f8 Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev 2016-05-16 23:00:53 +00:00
Hans Boehm
eb714f3d29 Merge "Clear more native pointers in finalizers" into nyc-dev
am: 53c33d9701

* commit '53c33d97013ad10a42d9b37fe77884f596250109':
  Clear more native pointers in finalizers

Change-Id: I0e28a59e0f2d60b38a5e2bdd55bbd72ec1da42d9
2016-05-16 22:57:14 +00:00
Android Build Merger (Role)
1d26925e8c Merge "Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b am: 5f8c5ec9a4" into nyc-mr1-dev-plus-aosp 2016-05-16 22:57:06 +00:00
Android Build Merger (Role)
aaa3b0dc12 Merge "Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693 am: de84a27872 am: 69083dd202" into nyc-mr1-dev-plus-aosp 2016-05-16 22:56:54 +00:00
Android Build Merger (Role)
175a9a6c68 Merge "Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02 am: 1d145e7d2b am: 231adb3e0f" into nyc-mr1-dev-plus-aosp 2016-05-16 22:56:42 +00:00
Svetoslav Ganov
4d8d0d9199 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b
am: 5f8c5ec9a4

* commit '5f8c5ec9a421b24213fa6c1e0201602088808783':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: I2666118c42a1d67b9e7e6751e627624fff8cdaa1
2016-05-16 22:55:57 +00:00
Svetoslav Ganov
c653375758 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b
am: 4f968024f4

* commit '4f968024f4822155e8428b9e5d8aea3114687412':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: Ia7acd68dfd29d855e26f11a36e04dde153055d62
2016-05-16 22:55:57 +00:00
Dirk Dougherty
cb96b76a22 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693 am: de84a27872
am: 14ecfb694d

* commit '14ecfb694d360a9cf86d1fe2b4f4fb2b59e339c8':
  Update default image for n preview docs. Update tools resources.

Change-Id: Ib699356a0b8e4694f1839c521ded13cec5db1313
2016-05-16 22:55:51 +00:00
Dirk Dougherty
e376f6dcbc Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693 am: de84a27872
am: 69083dd202

* commit '69083dd20235a9aff992a72537f467482bdb637f':
  Update default image for n preview docs. Update tools resources.

Change-Id: I4a97ed913bfe7dd7dff73176085703c2db4e4eaa
2016-05-16 22:55:47 +00:00
smain@google.com
ba5e72b9ff Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02 am: 1d145e7d2b
am: 5d49dc4a37

* commit '5d49dc4a37eedcfb57cbf40b836c8ff040f2d5ba':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: Ia4b3ad784ae8288793a00aad3b6e0b9f348730c4
2016-05-16 22:55:43 +00:00
smain@google.com
7ce9278a97 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02 am: 1d145e7d2b
am: 231adb3e0f

* commit '231adb3e0fbe7cc04971039babfcad717d4af282':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: I5c4dcfc334d5ff5e72a1d83e2b5d12f54f211783
2016-05-16 22:55:36 +00:00
Svetoslav Ganov
4f968024f4 Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev
am: 008d73bd5b

* commit '008d73bd5b3ca4b1b7a8af61957759d65dd67e3b':
  Ensure app op restrictions reset when the app that set them dies.

Change-Id: I177256a7f65b3f5c98e5ddc5cf57a7cb47c965ab
2016-05-16 22:51:03 +00:00
Android Build Merger (Role)
7cafe32dcd Merge "Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c am: 3f41684de5" into nyc-mr1-dev-plus-aosp 2016-05-16 22:50:45 +00:00
Dirk Dougherty
14ecfb694d Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs am: 0a957d5aa2 am: b33f36497d am: a4101e6693
am: de84a27872

* commit 'de84a27872a9eca52d0703d602335f558021c10e':
  Update default image for n preview docs. Update tools resources.

Change-Id: Id0e213e7f338a181224c407ae35a8060782c4b54
2016-05-16 22:50:41 +00:00
Scott Main
5d49dc4a37 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474e9 am: 592b36a326 am: 0b019a3d02
am: 1d145e7d2b

* commit '1d145e7d2b4b10ba0b9330766e3975802e5aa1e4':
  Avoid weird line wrapping by removing columns and forcing line breaks between the links

Change-Id: Idcdef61340accff4d5acc85a390fd6aac33fc500
2016-05-16 22:50:27 +00:00
Jaewan Kim
84fa21bc10 Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c
am: 3f41684de5

* commit '3f41684de5965b769842ae088fb222d3217393c9':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I1522bee969ae79284555ec059443f26f2562b1ba
2016-05-16 22:50:20 +00:00
Jaewan Kim
cef7a0c03e Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c
am: 8bae438cde

* commit '8bae438cde036c1ebc59fa95cc0ff47f44d3057d':
  Workaround that Recents is shown again after an activity is PIPed

Change-Id: I449afcc2f5622e015be8a89bf829459dc7ae00cc
2016-05-16 22:50:02 +00:00