Commit Graph

13520 Commits

Author SHA1 Message Date
Alex Hills
c295774697 Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
am: 7816efa6af

Change-Id: Idcf5a780abc93b3a7c5d3e497b98352ddc26d257
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev 2016-06-15 16:02:48 +00:00
Yohei Yukawa
176642ec2c Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
am: 03f759e87e

Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
2016-06-14 00:38:47 +00:00
Yohei Yukawa
03f759e87e Merge "Add InputConnection#insertContent()." into nyc-mr1-dev 2016-06-14 00:26:39 +00:00
Brad Ebinger
3b76cb7609 Merge \"Add EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev
am: a3d4baf43b

Change-Id: I56f5854a39325671b1854ce453a416eb24b9c8a8
2016-06-13 17:41:51 +00:00
Brad Ebinger
a3d4baf43b Merge "Add EVENT_CALL_MERGE_FAILED Connection Event" into nyc-mr1-dev 2016-06-13 17:39:19 +00:00
Tao Bao
20f5cd8d9e Merge \"Add RecoverySystem.rebootWipeAb() system API.\" into nyc-mr1-dev
am: 9aa66d57c6

Change-Id: I54cdfff9c5d82daaac50b18a79f87b477863f643
2016-06-13 16:50:41 +00:00
Tao Bao
9aa66d57c6 Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Yohei Yukawa
152944f490 Add InputConnection#insertContent().
Providing an official protocol for IMEs to insert an image to the
application is something that has been requested from many IME
developers to Android OS.  With this CL, IMEs are able to ask
applications to insert a content including image files as follows.

 1. An application that opts in to this protocol specifies a list of
    supported content MIME types in EditorInfo#contentMimeTypes.
 2. When an IME is actively interacting with such an application, the
    IME can call InputConnection#insertContent() with a InputContentInfo
    that contains content URI, metadata (ClipDescription), and an
    optional link URI.
 3. The application can read the stream data from the given content URI
    to insert the content into somewhere in the application.

Detailed design background can be found in the JavaDoc of
InputConnection#insertContent().

Bug: 22830793
Change-Id: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
2016-06-10 19:04:34 -07:00
Tao Bao
1327a97a07 Add RecoverySystem.rebootWipeAb() system API.
It reboots into recovery and securely wipes an A/B device.

Bug: 27253717
Bug: 29159185
Change-Id: I8252894db5c1df48bc4a8728b7f0e0f18aebc44c
2016-06-09 16:57:54 -07:00
Alex Hills
9f08761f08 Adds a flag to Action.WearableExtender to display actions inline on Wear
Bug:28909490
Change-Id: I124bdd0a91ed7d78c527988e390b823dcbd1b85f
2016-06-08 15:42:04 -04:00
Amith Yamasani
b8ab1d3b12 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp
Change-Id: Id4b3de71842eedd49684b367ed993f44f2f91970
2016-06-08 11:50:57 -07:00
Amith Yamasani
211b5b10f6 resolve merge conflicts of 718f321 to nyc-mr1-dev
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
2016-06-08 18:43:46 +00:00
Amith Yamasani
c33507d441 Merge \"Add a separate read permission for oem unlock state\" into nyc-dev
am: 718f321369

Change-Id: I934a06f985319d4520044aff7adf4329f0c27953
2016-06-08 18:16:40 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Makoto Onuki
a3a56ab9d1 Merge \"ShortcutManager: deal with changing resource IDs on app update\" into nyc-mr1-dev
am: 3bb4366006

Change-Id: Ic2adc036d256a0ad3da4f65a20edfc4cdeb30447
2016-06-08 17:11:55 +00:00
Makoto Onuki
157b1628fd ShortcutManager: deal with changing resource IDs on app update
- When an app is upgraded, all the resource IDs may change.  So
if a shortcut is previously published with an icon for res ID 100
and the publisher is upgraded, resource #100 may refer to something
different.

- So now the service also remembers resource names for icon resources,
as wells as string resources.  When an app is updated, the service
fetch the updated resource IDs by name.

- Also extract all string resources when a shortcut is published
and persist them, so that even when the original string resources are
removed from the app, the launcher can still show the extracted strings.

- When the system locale changes, re-extract all string resources.

- Also really hide the constants in ShortcutInfo that were
accidentally made public.

Change-Id: I23c29b45c1de5d76175229190a1533c9c62c5960
2016-06-07 16:11:30 -07:00
Brad Ebinger
8f6b7a8caf Merge \"Adds CDMA Voice Privacy Property to Call\" into nyc-mr1-dev
am: 5eebdd8bb8

Change-Id: Ie647b2b460dded6a501f5c19849d610c29d5ebaa
2016-06-07 22:23:50 +00:00
Brad Ebinger
5eebdd8bb8 Merge "Adds CDMA Voice Privacy Property to Call" into nyc-mr1-dev 2016-06-07 22:14:51 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
2016-06-03 14:33:26 -07:00
Jeff Sharkey
b8fff382c6 Fix build after merge.
am: 9351225839

* commit '935122583967643979f103030b95afd59e57ff59':
  Fix build after merge.

Change-Id: I7c92c65266e623f8b245b4dcbbd6aef85eaef74b
2016-06-03 20:40:32 +00:00
Jeff Sharkey
9351225839 Fix build after merge.
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
2016-06-03 14:34:16 -06:00
Brad Ebinger
15847070b5 Adds CDMA Voice Privacy Property to Call
Adds the CDMA Enhanced Voice Privacy Property to a Call when it has been
enabled for the call by the network.

Bug: 26931679
Change-Id: I1f5b4a4fb22fe6aaaf0c424ef11925c6058c6e82
2016-06-03 13:34:07 -07:00
Wang Xiaolei
0c26c32403 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9
am: f5b0bf3563

* commit 'f5b0bf356350b53d02d6dfea96defd087f8c2f2a':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: I7b86da45e999d538641dcc4221c25eb148adf495
2016-06-03 20:01:37 +00:00
Jeff Sharkey
f5b0bf3563 Merge commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc' into manual_merge_44b24c9
Change-Id: Ie4e0b91f5479f43864b86ff013ff8eb7bed6cd86
2016-06-03 13:53:48 -06:00
Michael Wright
36481749e6 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
am: 44b24c9b38

* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
2016-06-03 19:27:36 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Todd Kennedy
a84b5d0ebd Merge "Round icons" into nyc-mr1-dev
am: 7d64d64269

* commit '7d64d642692ff6728ee83e1a0d8658909d1bdd44':
  Round icons

Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
2016-06-03 00:38:26 +00:00
Todd Kennedy
bb8a42da70 Round icons
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
2016-06-02 15:57:54 -07:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00
Shubham Ajmera
ecdcc0ab43 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
am: 85a5fa0e76

* commit '85a5fa0e76edd5e1e54cee08abe4fbc4052d7893':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: Id99dd689652359a481f605349b01282c5178d302
2016-06-02 12:41:13 +00:00
Shubham Ajmera
85a5fa0e76 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug: 27331465
(cherry-picked from commit 0652d1c024)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
2016-06-02 12:34:04 +00:00
Shubham Ajmera
2952abb081 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4
am: 99296c2100

* commit '99296c2100e3062fe8d3663d2d373d1112441ad5':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I90079797eadabcd3b0b06a55c79e3944e3c347b2
2016-06-02 11:07:46 +00:00
Shubham Ajmera
99296c2100 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461
am: 4b44cb24b4

* commit '4b44cb24b4d8bb938451321d26216bc2a01d6411':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I08c901400757ca6cd3525083bb43840947306039
2016-06-02 10:55:04 +00:00
Makoto Onuki
facbcba617 Merge "ShortcutManager: API rename" into nyc-mr1-dev
am: 60585d12e7

* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
  ShortcutManager: API rename

Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
2016-06-01 23:32:22 +00:00
Ta-wei Yen
cbf3aa8789 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
am: 912e2b2c80

* commit '912e2b2c80ba7641f649ae7e130d9febc4caac44':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
2016-06-01 23:26:31 +00:00
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Ta-wei Yen
912e2b2c80 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 2016-06-01 21:49:47 +00:00
Ta-wei Yen
c75b215eb3 Add support for source-specific VVM state in VoicemailContract
Negative values of the field CONFIGURATION_STATE, DATA_CHANNEL_STATE,
NOTIFICATION_CHANNEL_STATE is reserved to voicemail source for its'
specific errors. SOURCE_TYPE can be set to help interpret the error
codes.

Typically the OMTP visual voicemail source will set SOURCE_TYPE to the
same value of visual voicemail type set with 
CarrierConfigManager.KEY_VVM_TYPE_STRING, such as "vvm_type_omtp".

For example, the OMTP visual voicemail source could set 
CONFIGURAITON_STATE to -5 and SOURCE_TYPE to "vvm_type_foo", and the
client can find -5 for "vvm_type_foo" means "PIN is not set by the user"

+ Field SOURCE_TYPE
+ Docs to specify negative values are reserved for the source
- Removed hidden helper method SetStatus() and SetQuota(). The 'ignore'
  value is conflicting with reserved values.

Bug:26944391
Change-Id: I0930f684dadd25ae94e3ea68a7658c7ae423e3e3
2016-06-01 20:04:57 +00:00
Makoto Onuki
eddbfecb8d ShortcutManager: API rename
The words "title" and "text" implies that "text" is a secondary label
that's shown with the title, but it turned out the launcher would show
only one of those depending on how much space it has.

So now we change them to "shortLabel" and "longLabel"

Note we're only changing the API surface -- in order to mimimize
the impact to the code, internally we'll keep using the old names.

- Also remove "shortcutRank" while I'm here -- it should be implied
from the order of the XML elements.

Bug 29057378

Change-Id: I3203f63b0318c7462c1c61fef43cf9755fa8c008
2016-06-01 10:09:10 -07:00
Brad Ebinger
2c1c164578 Add EVENT_CALL_MERGE_FAILED Connection Event
Currently, if a call merge failure occurs, we can not try again because
the merge button "gets stuck". This change adds a new Connection Event
that notifies the InCall UI to enable the merge button so that the user
can try again.

Bug: 28847375
Change-Id: I376f6ee446e135577a54aa36ff1dfc77af87261a
2016-05-31 11:09:02 -07:00
Makoto Onuki
fcb523502b Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev
am: 8c5578bcb0

* commit '8c5578bcb0de2b3701de1833392dd56445d5024d':
  Fix build breakage due to res-id changes

Change-Id: I48f34526be7f128189bea6dff49d5b9761f98385
2016-05-28 00:09:27 +00:00
Makoto Onuki
c421b31447 Fix build breakage due to res-id changes
Change-Id: I3c8160b277e2dac83b433b5454d18b7253f5d0bd
2016-05-27 16:54:04 -07:00
Bart Sears
56e2b4a83e Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev
am: ffc8723d88

* commit 'ffc8723d883a09fdff5862ed01bde29c792c3c94':
  Revert "Finalize resource IDs for N."

Change-Id: Icaf17a36cf1fea5f95610fb055faf65d90021abe
2016-05-27 23:14:57 +00:00
Bart Sears
ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 2016-05-27 23:09:24 +00:00
Bart Sears
f87ee48da9 resolve merge conflicts of 82a8c5f to nyc-mr1-dev
Change-Id: I7ba17e4b36997684d5f542900a81a03d28228a7a
2016-05-27 16:02:22 -07:00
Makoto Onuki
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
2016-05-27 22:52:43 +00:00