Steve Pomeroy
3f0fcdb1f6
Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902 am: b6c826227d
...
am: d88ca0e659
2016-05-12 22:31:49 +00:00
Steve Pomeroy
d88ca0e659
Merge "ContentValues: improve documentation" am: b44d4207c1 am: 78e5a04902
...
am: b6c826227d
2016-05-12 22:29:25 +00:00
Steve Pomeroy
b6c826227d
Merge "ContentValues: improve documentation" am: b44d4207c1
...
am: 78e5a04902
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
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
2016-05-12 01:23:54 +00:00
Adam Lesinski
04d676b3ae
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
...
am: 3723194dc8
2016-05-12 01:11:21 +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
2016-05-11 14:47:09 +00:00
Todd Kennedy
d2ebc5e3ab
Merge "Fix secondary ABI instrumetion" into nyc-dev am: f09f069936
...
am: fc7701c569
2016-05-11 14:44:34 +00:00
Todd Kennedy
fc7701c569
Merge "Fix secondary ABI instrumetion" into nyc-dev
...
am: f09f069936
2016-05-11 14:41:44 +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
2016-05-11 12:45:21 +00:00
Greg Kaiser
bac3e57f3d
Merge "GradientColor: Fix typo in documentation." into nyc-dev am: a452dd3fd9
...
am: 9311165c2c
2016-05-11 12:42:17 +00:00
Greg Kaiser
9311165c2c
Merge "GradientColor: Fix typo in documentation." into nyc-dev
...
am: a452dd3fd9
2016-05-11 12:39:38 +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
2016-05-10 23:09:26 +00:00
Makoto Onuki
c9289b8053
Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev
...
am: 4a3b597f55
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
2016-05-06 17:51:43 +00:00
Hans Boehm
3bc625a30a
Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4
...
am: 1a72cf2e4f
2016-05-06 17:47:23 +00:00
Hans Boehm
1a72cf2e4f
Merge "Improve grammar in startService() documentation." am: e3a25ad692
...
am: cc9c83dbd4
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
2016-05-05 00:49:47 +00:00
Ruben Brunk
d12543c983
Merge "Update VR API docs." into nyc-dev am: 01d232988a
...
am: 2d1a1a4521
2016-05-04 23:44:04 +00:00
Ruben Brunk
17f3a40645
Merge "Update VR API docs." into nyc-dev
...
am: 01d232988a
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
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
2016-05-04 21:54:46 +00:00
Makoto Onuki
5b9d876ef5
Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev
2016-05-04 21:28:17 +00:00
Makoto Onuki
8569452603
ShortcutManaegr: bug fixes
...
Fixes 28590035
Fixes 28586105
Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
2016-05-04 13:00:41 -07:00
TreeHugger Robot
221c6e6db7
Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev
2016-05-04 17:07:13 +00:00
Vladislav Kaznacheev
f67661cc7a
Fix ClipData JavaDoc and behavior that contradicts JavaDoc
...
1. Expand JavaDoc for ClipData.addItem to clarify how MIME types are affected.
2. Add "text/uri-list" to MIME type list only for non-content URIs (as JavaDoc explicitly says).
Bug: 28564003
Change-Id: I074daf34310323725690a9ba2c7dff0542ed6349
2016-05-03 16:48:24 -07:00
Vladislav Kaznacheev
6b8b7996ff
Merge "Merge "Fix typos in ClipData JavaDoc" into nyc-dev am: 77843a4213 am: 0fd5036fec" into nyc-mr1-dev-plus-aosp
...
am: 1adf75e6bb
2016-05-03 19:42:58 +00:00
TreeHugger Robot
77843a4213
Merge "Fix typos in ClipData JavaDoc" into nyc-dev
2016-05-03 19:28:32 +00:00
Vladislav Kaznacheev
7e4669c5a6
Fix typos in ClipData JavaDoc
...
Also removed the obsolete text regarding iconic representation
and fixed some whitespace.
Bug: 28536304
Change-Id: I55ca681b86a121018903a41fff228e7c6126c7e7
2016-05-03 10:09:06 -07:00
Makoto Onuki
d1bc17aacd
Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4" into nyc-mr1-dev am: 59cfcb502d
...
am: 2c0af8597d
2016-05-03 16:45:09 +00:00
Makoto Onuki
7d164d35a4
Merge "ShortcutManager: finishing touches" into nyc-dev
2016-05-03 16:27:46 +00:00
Ruben Brunk
927d3453d3
Update VR API docs.
...
Bug: 28526281
Change-Id: Iff48d02a2fee542c5ded7fc8cd6cf74957eb738c
2016-05-02 19:30:51 -07:00
Svet Ganov
e15ad0a4ef
Merge "Disable unused features" into nyc-dev am: d4d1512b64 am: d76b1a5dad
...
am: fa58b2752a
2016-05-03 01:45:17 +00:00
Svetoslav Ganov
d4d1512b64
Merge "Disable unused features" into nyc-dev
2016-05-03 01:37:01 +00:00
Svet Ganov
a7532cfa46
Disable unused features
...
The multi-package APKs feature was not validated and is now disabled.
Also the ephemeral work was postponed which requires disabling of the
ephemeral cookie APIs.
bug:28514747
Change-Id: Iab7f11c503a76bcc414408dfebdf200843db814e
2016-05-02 18:36:13 -07:00
Raph Levien
779869cabf
Merge "Make LocaleList constructor non-nullable" into nyc-dev am: 4d826831b5 am: c29bc443f8
...
am: 16e416ec69
2016-05-03 00:38:48 +00:00
Raph Levien
4d826831b5
Merge "Make LocaleList constructor non-nullable" into nyc-dev
2016-05-03 00:15:24 +00:00
Todd Kennedy
c699a02479
Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc12 am: 09bad50ef4
...
am: fa1f49c504
2016-05-02 23:46:55 +00:00
