Brad Ebinger
87737bd04b
Merge \\"Adds CDMA Voice Privacy Property to Call\\" into nyc-mr1-dev am: 5eebdd8bb8
...
am: 8f6b7a8caf
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
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
2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72
Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
...
am: c27660d45a
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
Jeff Sharkey
eb1419f052
Merge commit \'44b24c9b38d87dfd8bee2aca381f18a9106313dc\' into manual_merge_44b24c9 am: f5b0bf3563
...
am: b8fff382c6
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
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
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
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
2016-06-03 15:44:53 +00:00
Makoto Onuki
51c7ce7531
Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
...
am: 37087ad710
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
2016-06-03 00:44:54 +00:00
Todd Kennedy
a84b5d0ebd
Merge "Round icons" into nyc-mr1-dev
...
am: 7d64d64269
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
2016-06-02 12:41:13 +00:00
Shubham Ajmera
85a5fa0e76
Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
...
Bug: 27331465
(cherry-picked from commit 0652d1c024
2016-06-02 12:34:04 +00:00
Shubham Ajmera
63f480a1c9
Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
...
Bug: 27331465
(cherry-picked from commit 0652d1c024
2016-06-02 13:29:40 +01:00
Shubham Ajmera
69e94d5b46
Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4 am: 99296c2100
...
am: 2952abb081
2016-06-02 11:36:02 +00:00
Shubham Ajmera
2952abb081
Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4
...
am: 99296c2100
2016-06-02 11:07:46 +00:00
Shubham Ajmera
99296c2100
Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461
...
am: 4b44cb24b4
2016-06-02 10:55:04 +00:00
Makoto Onuki
9a968df828
Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7
...
am: facbcba617
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
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
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
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
2016-05-28 01:00:25 +00:00
Makoto Onuki
53da7b9ee3
Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f
...
am: 451afea589
2016-05-28 00:26:15 +00:00
Makoto Onuki
fcb523502b
Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev
...
am: 8c5578bcb0
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
2016-05-27 23:14:57 +00:00
Makoto Onuki
09c6612288
resolve merge conflicts of 8de7c95 to master
...
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
2016-05-27 16:10:34 -07: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
2016-05-27 22:52:43 +00:00
Michael Wright
7eb543ef2c
Merge "Revert "Finalize resource IDs for N."" into nyc-dev
...
am: 82a8c5f246
2016-05-27 21:45:48 +00:00
Makoto Onuki
04b9aab945
ShortcutManager: Implement get-drawable APIs
...
Bug 28594168
Change-Id: I750e800b59dca56877ba78baac808aff93acd19d
2016-05-27 10:49:17 -07:00
