Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,368 Commits 3 Branches 0 Tags
5fcfdab573fa08ed21b1d726797754d079140af2
Commit Graph

14033 Commits

Author SHA1 Message Date
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
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
Makoto Onuki
53da7b9ee3 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f 
am: 451afea589

* commit '451afea5892454be029910b18a73d27bf41ad5bd':
  ShortcutManager: Implement get-drawable APIs

Change-Id: I6f72f51bbfed601c3ab087921e8de9a64ad785ee
 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

* 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
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

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

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
 2016-05-27 22:52:43 +00:00
Michael Wright
7eb543ef2c Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: 82a8c5f246

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

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
 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
Makoto Onuki
8de7c953a1 Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev 
am: 05e0a9f3cf

* commit '05e0a9f3cf632e237654c13f6d223eb22ea3be89':
  ShortcutManager: Support manifest shortcuts

Change-Id: Ib0a2620e92249452130a681208424fbddfa1935b
 2016-05-27 17:34:04 +00:00
Makoto Onuki
22fcc68e6b ShortcutManager: Support manifest shortcuts 
- Now apps can publish shortcuts via AndroidManifest.xml
(Sample: I5b127150)

- Rename some APIs per API council feedback

- Publishers can now "disable" shortcuts.
(https://docs.google.com/presentation/d/1raUn1QBURDb1yrd6mSmVxII9ezNh3MWukODdtufJ29U/edit#slide=id.g13ef592464_7_39)

Bug 28785283
Bug 28536066

Change-Id: I4a126841e43e40139bb4baa6d0f98ad7b3a75ac1
 2016-05-27 09:40:58 -07:00
Akshay Thakker
173e2e6b90 Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 
am: c37fb8aa6e

* commit 'c37fb8aa6e2094336201840ec0a44aa0a5ad6913':
  Finalize resource IDs for N.

Change-Id: Ide5ce846a130624db23ab3df2fa3fc70d4e04eab
 2016-05-27 03:50:27 +00:00
Michael Wright
c37fb8aa6e Merge "Finalize resource IDs for N." into nyc-dev 
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: Ied7ef4d95a5ef5ad8100db724a6bc71f916f9f22
 2016-05-27 03:31:15 +00:00
Michael Wright
66eeff63b7 Merge "Finalize resource IDs for N." into nyc-dev 
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: I6eb87bf4e6ee41ea32e497562635a8432b85ba59
 2016-05-26 23:25:11 +00:00
Jonathan Basseri
448b67ee15 resolve merge conflicts of 4c04097 to nyc-mr1-dev am: 04c35e78db 
am: 9a19e8948d

* commit '9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d':
  Change how TelephonyManager handles subscriptions.

Change-Id: I7f2c6b4b7b4c1a2229c43003f0cfa6734fdc227a
 2016-05-26 23:17:25 +00:00
Jonathan Basseri
9a19e8948d resolve merge conflicts of 4c04097 to nyc-mr1-dev 
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
  Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
 2016-05-26 23:13:17 +00:00
Jonathan Basseri
04c35e78db resolve merge conflicts of 4c04097 to nyc-mr1-dev 
Change-Id: I256514588af20985108f72a5e204811904f87c9c
 2016-05-26 11:41:17 -07:00
Michael Wright
9ed5eefc28 Revert "Finalize resource IDs for N." 
This reverts commit 7c8e76f87d.

Bug: 28810934
Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
 2016-05-26 17:38:06 +01:00
Michael Wright
7c8e76f87d Finalize resource IDs for N. 
Bug: 28810934
Change-Id: If68bfb46cc5fa2d5ea0ee613689198e1ea42dce7
 2016-05-26 17:35:28 +01:00
Ji Yang
811d0411f3 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d 
am: 54b280ba66

* commit '54b280ba66d8f92d73711df4d02add1140eb416f':
  Rename carrier messaging API constant.

Change-Id: Ib94ec913651d3b0c92e43927cb8a091732319777
 2016-05-26 16:31:58 +00:00
Jonathan Basseri
531cd8724c Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
 2016-05-26 16:12:55 +00:00
Ji Yang
54b280ba66 Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff 
am: e6c6ca417d

* commit 'e6c6ca417da6f62de4bdebd7b380f12b751a08b7':
  Rename carrier messaging API constant.

Change-Id: I9e2d1c3572a6e7658e6ba66a7d4c01fd4a4c805a
 2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
 2016-05-26 15:54:38 +00:00
Ji Yang
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
 2016-05-26 15:54:27 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Michael Wright
5944e07e99 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e 
am: 4f6ae7bbaa

* commit '4f6ae7bbaa4654e14d70e9fa503ceb713c90c342':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Ieceb1c9248bfc618ed1c70821d4cf746128bc679
 2016-05-26 14:51:30 +00:00
Michael Wright
4f6ae7bbaa Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
 2016-05-26 14:39:03 +00:00
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
 2016-05-26 14:38:56 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Daichi Hirono
86c1a9bf60 Remove MTP API marked as @removed. 
BUG=28146379

Change-Id: I4f0a380941663eac423f8a5633447f1eceb516cb
 2016-05-26 16:39:21 +09:00
Adam Powell
8c6e691c09 Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05 
am: 3579a6a634

* commit '3579a6a63474918be6d7d3df21bcf132e8dc0e54':
  N is API 24

Change-Id: I15afe037702682bb124355b8da31af37444ded2b
 2016-05-26 02:21:03 +00:00
Adam Powell
3579a6a634 Merge "N is API 24" into nyc-dev am: bc983c4431 
am: 0b478d5b05

* commit '0b478d5b052c4440a0eb8686d400d1595ead1857':
  N is API 24

Change-Id: I90b772e177cefff1071a9859f046f683411a7e59
 2016-05-26 01:56:59 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions. 
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
 2016-05-25 18:49:11 -07:00