Commit Graph

4253 Commits

Author SHA1 Message Date
Makoto Onuki
1b537cc623 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808
2016-05-17 18:20:19 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
2016-05-17 18:14:39 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Xiaohui Chen
bb803cf2f6 pm: query both direct boot un/aware activities
Bug: 28762791
Change-Id: I64009c75ae7ac8784e739349b70d0413f0b4681a
2016-05-17 16:24:18 +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
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
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
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
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
5bcf7650b4 Merge "Update docs for ColorStateList to include alpha" into nyc-dev 2016-05-16 19:30:38 +00:00
Alan Viverette
582dcac856 Update docs for ColorStateList to include alpha
Bug: 28760030
Change-Id: I309364002220b9896f5ddf29dabde79636a722e9
2016-05-16 12:37:55 -04:00
Steve Pomeroy
4c8c470015 Merge "ContentValues: improve documentation" into nyc-dev
am: 33d0ff9959

* commit '33d0ff995976533f9989cd6ec95c3de5ba9aee05':
  ContentValues: improve documentation

Change-Id: I29244d0c039abcd08139e2814bb465e2e5b9e03a
2016-05-13 01:17:57 +00:00
Steve Pomeroy
b31b1cc5ff ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Signed-off-by: Steve Pomeroy <steve@staticfree.info>

(cherry picked from commit 1276b5f29e)

Change-Id: Id6f4e93dcca64dd41daeb4066d804ff173f4747b
2016-05-12 16:51:52 -07:00
Steve Pomeroy
3f0fcdb1f6 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 am: b6c826227d
am: d88ca0e659

* commit 'd88ca0e659d89147e62addac01ce08192beb051e':
  ContentValues: improve documentation

Change-Id: Id42ec6e2c361bd0b8a279c8e42f8ac5232f0850e
2016-05-12 22:31:49 +00:00
Steve Pomeroy
d88ca0e659 Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
am: b6c826227d

* commit 'b6c826227dfbc1cdb565098a9df5b897dd1137f3':
  ContentValues: improve documentation

Change-Id: I6a3f730971777a19460f9afeafca1878c4fd522d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b6c826227d Merge "ContentValues: improve documentation" am: b44d4207c1
am: 78e5a04902

* commit '78e5a0490278bc12cb7e3c12225aba05639c922f':
  ContentValues: improve documentation

Change-Id: Ifce0816dc5565e6b7944de92ee814f97cb4753b6
2016-05-12 22:27:12 +00:00
Steve Pomeroy
1276b5f29e ContentValues: improve documentation
Correct and clarify the documentation for ContentValues.

Change-Id: Iddf54da093e97c32da2568eab8802b1b2715303b
Signed-off-by: Steve Pomeroy <steve@staticfree.info>
2016-05-12 21:18:15 +00:00
Makoto Onuki
82c64a485a Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9 Merge "Remove ShortcutManager" into nyc-dev 2016-05-12 16:32:56 +00:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Adam Lesinski
ad3773a154 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev am: 3723194dc8
am: 04d676b3ae

* commit '04d676b3ae36bca3f3f80b522024121f2238835d':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Id439d6d314805f378bc068144eabd9a16a521f25
2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: I0b86c2bd861a7de788917c6bae7bccf02dc97b31
2016-05-12 01:11:21 +00:00
Adam Lesinski
ebfb372876 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am: 3723194dc8

* commit '3723194dc831f4734d465602b2e21449d9357c2e':
  BluetoothManager: Make requestControllerActivityInfo one call

Change-Id: Iafdc65be9a8045c10ee485685a4222ece087e031
2016-05-12 01:11:18 +00:00
Adam Lesinski
3723194dc8 Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev 2016-05-12 00:59:29 +00:00
Makoto Onuki
538c440c33 Remove ShortcutManager
Bug 28704708

Change-Id: If7b739adeec38d81d554fc1cf34c81194f5d67b9
2016-05-11 14:25:55 -07:00
Todd Kennedy
728fe71b21 Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936 am: fc7701c569
am: d2ebc5e3ab

* commit 'd2ebc5e3ab900905b4b14de55e4be9d0e70c51d6':
  Fix secondary ABI instrumetion

Change-Id: Ieceae5d3fe442bbd0c6821ead5dc37dc2ee83a71
2016-05-11 14:47:09 +00:00
Todd Kennedy
d2ebc5e3ab Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936
am: fc7701c569

* commit 'fc7701c56923369bb30eae6559dfbc100a174477':
  Fix secondary ABI instrumetion

Change-Id: I88afbda2d0b4f87f03b9806ff6de9a4066bd4dac
2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569 Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I7a48511c8038725524abd8fc0adbd86e9e9fe09c
2016-05-11 14:41:44 +00:00
Todd Kennedy
9580593e5d Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I0ad719338b8cbcf9cf90526d2e0196aa25ff07ad
2016-05-11 14:41:41 +00:00
Todd Kennedy
f09f069936 Merge "Fix secondary ABI instrumetion" into nyc-dev 2016-05-11 14:35:19 +00:00
Greg Kaiser
b482032705 Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9 am: 9311165c2c
am: bac3e57f3d

* commit 'bac3e57f3d5e1d4b1ec0b184d4bbc9657f7d0f13':
  GradientColor: Fix typo in documentation.

Change-Id: I91779eec11c9966c9f1ea8e6566c96a301c50f6d
2016-05-11 12:45:21 +00:00
Greg Kaiser
bac3e57f3d Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9
am: 9311165c2c

* commit '9311165c2cbb42fe37a42dc916e303ac180f9f6c':
  GradientColor: Fix typo in documentation.

Change-Id: I590125c62d1e5b73bfe3b0255f69c07daf3d78b9
2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I392ac824d733dcbeb2e79d5be4ad1668ad3400cc
2016-05-11 12:39:38 +00:00
Greg Kaiser
5662120923 Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I647222141e85163cefe2241a96439f0eb3d7a97a
2016-05-11 12:39:34 +00:00
Greg Kaiser
2d609eda74 GradientColor: Fix typo in documentation.
Bug: 28678266
Change-Id: I8f551108643698a1b6c573911509a4e48ad88783
2016-05-10 17:05:31 -07:00
Makoto Onuki
7608f5d214 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev am: 4a3b597f55
am: c9289b8053

* commit 'c9289b805307ff071ad2b17936bfb4b4a6f4ad84':
  Refactoring ShortcutManager + bug fixes.

Change-Id: I9b584cd3ff0125294556fc3ca56cc01895167367
2016-05-10 23:09:26 +00:00
Makoto Onuki
c9289b8053 Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev
am: 4a3b597f55

* commit '4a3b597f557ef900299202ef88a6e601c0629368':
  Refactoring ShortcutManager + bug fixes.

Change-Id: Ief3a0dd2c81a2343895a88d9049b48d19bac6ac1
2016-05-10 23:07:02 +00:00
Todd Kennedy
e713efcac1 Fix secondary ABI instrumetion
When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.

Bug: 28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
2016-05-10 15:16:13 -07:00
Makoto Onuki
c51b2876ec Refactoring ShortcutManager + bug fixes.
- Don't pass the ShortcutService instance as an argument.  This tiny
optimization is no longer meaningful now that PackageShortcut and
PackageLauncher have reference to ShortcutUser.

- Rename mLauncherComponent to mDefaultLauncherComponent for clarity.

- Don't instantiate ShortcutPackage instances when not needed.

- Don't allow intents with a null action.

- Also improve javadoc.

Bug 28592642
Bug 28474517
Bug 28557169

Change-Id: I8790d3494bf3b92c143c02824b0ed0e514504baa
2016-05-10 14:28:31 -07:00
Adam Lesinski
991357fe25 BluetoothManager: Make requestControllerActivityInfo one call
Instead of making multiple calls into the Bluetooth service,
make one call that can timeout. This helps prevent cases
when the Bluetooth process hangs and the system_server is calling into
it and causes a WATCHDOG restart.

Bug:28658141
Change-Id: I37778b7b6e508be420a21bdf23593ae89b38f5b8
2016-05-10 14:00:03 -07:00
Hans Boehm
d89abcf16d Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 am: 1a72cf2e4f
am: 3bc625a30a

* commit '3bc625a30af39a25a2dec5a5e70fb3fbd38c98ca':
  Improve grammar in startService() documentation.

Change-Id: Id179761ee138cecf7245788735dd3a3e063f9bc0
2016-05-06 17:51:43 +00:00
Hans Boehm
3bc625a30a Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4
am: 1a72cf2e4f

* commit '1a72cf2e4f7d94f004979ee140fbe3f17c5e350a':
  Improve grammar in startService() documentation.

Change-Id: Ifd50bd9f2b8c83e657bc6df419e70b30532649d0
2016-05-06 17:47:23 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
2016-05-06 17:41:18 +00:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation.
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
2016-05-05 13:09:28 -07:00
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
2016-05-05 00:49:47 +00:00
Ruben Brunk
d12543c983 Merge "Update VR API docs." into nyc-dev am: 01d232988a
am: 2d1a1a4521

* commit '2d1a1a45219d4946527c284eb801a1c9e966966c':
  Update VR API docs.

Change-Id: I6f3c0348d98db2d7c8f6e3d757ac77f02d4e179f
2016-05-04 23:44:04 +00:00
Ruben Brunk
17f3a40645 Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396
2016-05-04 23:43:50 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Makoto Onuki
0e86dfb802 Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp
am: ccf9c83765

* commit 'ccf9c8376595ddbed64cedd236349cb99a2e8708':
  ShortcutManaegr: bug fixes

Change-Id: I2aeb67ca5f46165b63e685c90d8acf6cb909b351
2016-05-04 22:09:57 +00:00
Vladislav Kaznacheev
9f842251b0 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 am: 423c902258
am: 040646bb08

* commit '040646bb084632713436ee6a2a0b9de99d4eee8d':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ifa6973f839dd2c8f4bac8befd6ad445f68a462d9
2016-05-04 21:54:46 +00:00