Commit Graph

266851 Commits

Author SHA1 Message Date
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
Tim Murray
267bf98d1a Merge "Make persistent apps become top correctly." into nyc-dev am: 29af3cab29 am: b9e8a87240
am: 6831611aa1

* commit '6831611aa11fc8f8bcdb7087ca0252d6cef2b26b':

Change-Id: I4bd4f67cae18c80eeea348b1f04d44d48b480d1d
2016-05-16 23:37:58 +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
Christopher Wiley
6d475970a2 Fix trivial warnings in Tethering.java
Add some missing @Override annotations.
Use template arguments to avoid explicit casting.
Ignore unclosed IndentingPrintWriter in dump().

Bug: 28798823
Test: Compiles.

Change-Id: I2cb6eb384ca23057c8059f4842b1c0d8248d03f8
2016-05-16 16:37:28 -07: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
964cc9dc3f Merge "Make persistent apps become top correctly." into nyc-dev am: 29af3cab29 am: 03a357f8e9
am: 0f6d5f8a04

* commit '0f6d5f8a04a373c893fd59e0506e274751c53d04':
  Make persistent apps become top correctly.

Change-Id: I10c57a404927ef4792d2afbd6649ebd96902b70c
2016-05-16 23:31:09 +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
Anthony Hugh
14deafdf4e Merge "Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev am: 91dd6209f8" into nyc-mr1-dev-plus-aosp
am: eb51b86aa1

* commit 'eb51b86aa1e7c2d40d5be9119b3e378dc7ecf87c':
  Change Priority Only mode defaults on watches

Change-Id: I9dee4245b8f9a0b44e94f08b4debd078a959ec3c
2016-05-16 23:09:59 +00:00
Hans Boehm
307d2a08ce Merge "Merge "Clear more native pointers in finalizers" into nyc-dev am: 53c33d9701 am: eb714f3d29" into nyc-mr1-dev-plus-aosp
am: 84ea1608c4

* commit '84ea1608c4be04b3f99d29446fdea5e2c823a3d4':

Change-Id: I6a4cde15d3a933ff488c4de738ae9865b9fe8d15
2016-05-16 23:09:56 +00:00
Hans Boehm
82f77b0cae Merge "Clear more native pointers in finalizers" into nyc-dev am: 53c33d9701 am: 41ffbd36ed
am: 7dcd190595

* commit '7dcd190595e093d3d3c2ae2b24af48e95e6e02f2':
  Clear more native pointers in finalizers

Change-Id: I27ca47ceb92a612c91a0423f95d043f626e43b31
2016-05-16 23:09:51 +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
Baligh Uddin
06e8fb847b Import translations. DO NOT MERGE
Change-Id: Ic9e7ed1f6c0d52231c302042f11d44513ba30b27
Auto-generated-cl: translation import
2016-05-16 16:07:07 -07: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
Svetoslav Ganov
2f21ae19c1 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
am: 1d26925e8c

* commit '1d26925e8c2d9c3b5260f31586360120b3caeb62':

Change-Id: I7740dcd60c653c72744ea4bbcdb79d589b303cdc
2016-05-16 23:05:06 +00:00
Dirk Dougherty
94e61650aa 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
am: aaa3b0dc12

* commit 'aaa3b0dc1233d4a3212c317931388c43f8f2971b':

Change-Id: I0d686f07794527687b80ff3f864b609d42f946d8
2016-05-16 23:05:00 +00:00
smain@google.com
6d47f0967c 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
am: 175a9a6c68

* commit '175a9a6c68d083b36b8904ac7a67175cf27f4d2c':

Change-Id: I8d13eab7747eb564e029fc88d8876402440dd85e
2016-05-16 23:04:51 +00:00
Svetoslav Ganov
4647732c9b Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b am: 4f968024f4
am: c653375758

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

Change-Id: Ic268c41a8867e26982d21a258d22a195e1c171c7
2016-05-16 23:04:36 +00:00
Dirk Dougherty
aa349f357b 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
am: cb96b76a22

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

Change-Id: I7615339e978a2f9f46b178faf84b9f06034c28c1
2016-05-16 23:03:58 +00:00
Scott Main
5a5e12b15d 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
am: ba5e72b9ff

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

Change-Id: I502aad87078b7c34cdd885e21d5b62f9291c2b0e
2016-05-16 23:03:38 +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
Jaewan Kim
9a740f5415 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
am: 7cafe32dcd

* commit '7cafe32dcd3a45b859d386414821b3a205e1590d':

Change-Id: I421ecc947102d684c2318ca106b9ff55e861a289
2016-05-16 22:56:56 +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
Jaewan Kim
22ac7ed38d Merge "Workaround that Recents is shown again after an activity is PIPed" into nyc-dev am: 174aa3346c am: 8bae438cde
am: cef7a0c03e

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

Change-Id: Ia0401634c0a1bf4c900fb8b7182c09898a39066a
2016-05-16 22:56:50 +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
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
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
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
Christopher Wiley
b41e74f41e Fix some trivial warnings in WifiP2pDevice.java
Add some missing @Override annotations, and mark some constants
as unused.

Bug: 28799169
Change-Id: I1ddef87ecb089b62e299544ae94a21d10ef42d98
Test: Compiles.
2016-05-16 15:54:06 -07: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
Jorim Jaggi
7b1fa0fb06 Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev am: 8e30eb3a7f am: 87072fed10
am: 54d47c8e1e

* commit '54d47c8e1e73721ee1db7dba3e3c5859779546ee':

Change-Id: Ifefc44a7110e99501173840e711482cba07b7dc6
2016-05-16 22:50:51 +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