Commit Graph

14069 Commits

Author SHA1 Message Date
Michael Wright
93b5f434a4 Remove Pointer Capture API
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I899649594c7ca8db5962fcdaa71c5b21d3aa42c3
2016-06-08 20:13:53 +00:00
Amith Yamasani
9f62bf9370 resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp
am: b8ab1d3b12

Change-Id: I9f4879ae27560ade8fa4e6124908c3dced68feb1
2016-06-08 19:03:36 +00: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
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
c4e64bc449 Merge \\"ShortcutManager: deal with changing resource IDs on app update\\" into nyc-mr1-dev am: 3bb4366006
am: a3a56ab9d1

Change-Id: Id5e39a35db803223a89100a8e23a7b3309cd9dd3
2016-06-08 17:23:34 +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
87737bd04b Merge \\"Adds CDMA Voice Privacy Property to Call\\" into nyc-mr1-dev am: 5eebdd8bb8
am: 8f6b7a8caf

Change-Id: Ic58027cec2c1f1c630f59936624665e050cb067e
2016-06-07 22:28:39 +00: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
Michael Wright
e051f6f1fd Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
2016-06-04 02:20:21 +01:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a
am: acfed07f72

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

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
2016-06-04 00:41:07 +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
eb1419f052 Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 am: f5b0bf3563
am: b8fff382c6

* commit 'b8fff382c63a51c6fc53a968226b26da8ea0c023':
  Fix build after merge.

Change-Id: Ic330f58f2582260eab566d524ad37dad995d8415
2016-06-03 21:04:16 +00:00
Jeff Sharkey
a0d2e12fe0 resolve merge conflicts of 0c26c32 to master
Change-Id: I2398a72d7a3575743e5948bc16b1b8582ccf106b
2016-06-03 15:00:10 -06: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
Clara Bayarri
1851790fa7 Merge "Add setOnDateChangedListener to DatePicker" 2016-06-03 16:30:51 +00:00
Makoto Onuki
cffb6041d2 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710
am: 51c7ce7531

* commit '51c7ce7531f5c1fc1ae442b1c6f206735599cea2':
  ShortcutManager: Implement usage report API

Change-Id: Ia713dbbb510d2f848b8866a4d0dc692f67803522
2016-06-03 15:44:53 +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
Clara Bayarri
68640b6809 Add setOnDateChangedListener to DatePicker
Also refactor slightly the hierarchy in TimePicker to use the
common parent AbstractTimePickerDelegate in the same way as
DatePicker.

Bug: 28310875
Change-Id: Iecaf206ba1691e26d4496014dc1d13f070c4722a
2016-06-03 15:42:06 +01:00
Todd Kennedy
d2bbc1e2a0 Merge "Round icons" into nyc-mr1-dev am: 7d64d64269
am: a84b5d0ebd

* commit 'a84b5d0ebdeb7d4d5670d490380f5a7a48282b90':
  Round icons

Change-Id: Iff9a17b9f826053c31aaa6ada8fb167f8e4520b5
2016-06-03 00:44:54 +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
Roozbeh Pournader
36cd87d04e Unhide CharSequence APIs to BidiFormatter
The APIs are useful in avoiding the unnecessary creation of strings
when you have a CharSequence that's not a String.

Bug: 26979409
Change-Id: I27cd157ca53edb5f44a1e69085a1882af3cc7c6a
2016-06-02 13:01:19 -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
63f480a1c9 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug: 27331465
(cherry-picked from commit 0652d1c024)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
2016-06-02 13:29:40 +01:00
Shubham Ajmera
69e94d5b46 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4 am: 99296c2100
am: 2952abb081

* commit '2952abb0814e749e2b5f2c2d1e7eee8c132420cb':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: Ic1f2c09c9ce73ef95cd2f703696c38015adff2df
2016-06-02 11:36:02 +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
9a968df828 Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7
am: facbcba617

* commit 'facbcba617766402b03c2b1ecc889dfc0fd9c4a2':
  ShortcutManager: API rename

Change-Id: If7da8f53354762bb7e035ab8a9c66e73886545ec
2016-06-02 00:50:25 +00:00
Ta-wei Yen
9e4df538ef Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev am: 912e2b2c80
am: cbf3aa8789

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

Change-Id: I196ff66863f852808ffbe2d67e5878f049b15a75
2016-06-02 00:41:02 +00:00
Daichi Hirono
fc4aa530de Merge "Remove MTP API marked as @removed." 2016-06-02 00:23:40 +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
Makoto Onuki
6037bd076d Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev am: 8c5578bcb0
am: fcb523502b

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

Change-Id: Iad52436972ce3956ec05bdb326b06e4420df14d0
2016-05-28 01:00:25 +00:00