Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,571 Commits 3 Branches 0 Tags
45fea4d6e9732d12fcc63243c678c405d7efae40
Commit Graph

13470 Commits

Author SHA1 Message Date
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
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
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
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
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
Adam Powell
0b478d5b05 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
 2016-05-26 01:22:00 +00:00
Adam Powell
528a5bd466 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
 2016-05-26 01:21:19 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Stephan Linzner
701438fbf2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 
am: 347d660ce2

* commit '347d660ce25e72835aefc794b584c07d32ae5264':
  Un-deprecated Android mock testing APIs

Change-Id: Ibf99d4b9812a92ff9dc24518540bbb7725c3c932
 2016-05-26 00:49:58 +00:00
Stephan Linzner
347d660ce2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I21d0f3a65af94074ba477d4acaa20ff9686f9f5c
 2016-05-26 00:33:05 +00:00
Stephan Linzner
14ba2e78fd Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I4a853b57b8cfbc834e43e050f26bc078c1b4e92c
 2016-05-26 00:32:51 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Derek Tan
9b8b72748c Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb 
am: 869f32d810

* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
  Per API review, revert the API renaming CL.

Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
 2016-05-26 00:00:49 +00:00
Derek Tan
869f32d810 Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
 2016-05-25 23:50:45 +00:00
Derek Tan
e214ff00ea Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
 2016-05-25 23:50:12 +00:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs 
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
 2016-05-25 22:54:27 +00:00
Antonio Cansado
cc1524eded Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 
am: f49cbec84c

* commit 'f49cbec84c1e2aa21b33d54ae97c54ed9c71bb32':
  Cleaning up NetworkStatsManager.

Change-Id: I0fd280e158eb3cfeb0b4f6066cc890439cffa02c
 2016-05-25 22:34:18 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
 2016-05-25 22:25:27 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
 2016-05-25 22:25:11 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Jeff Sharkey
e2c9ed48ba Merge "API council feedback: hide and document." into nyc-dev am: dfe232c763 
am: 19e2f49181

* commit '19e2f49181b209d790f551b374d6d24002de7c9b':
  API council feedback: hide and document.

Change-Id: I3715fc6e824f2a55517788299afe36145db597d7
 2016-05-25 20:54:18 +00:00
Jeff Sharkey
19e2f49181 Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
 2016-05-25 20:51:07 +00:00
Jeff Sharkey
55a83354bf Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
 2016-05-25 20:51:03 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Philip P. Moltmann
27f54d6001 Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb 
am: 8bfb5b971d

* commit '8bfb5b971d46daecf72c7c8e179279fb9206ad00':
  Changes based on API council feedback for performContextClick

Change-Id: I8317e028e1bd65ddf2ceb5c36b6db2fdb763f986
 2016-05-25 19:14:24 +00:00
Mady Mellor
3425c6c62c Merge "Changes based on API council feedback for performContextClick" into nyc-dev 
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ief8c3036b93c28b27ba2f117ec656d38a1562fcf
 2016-05-25 19:10:59 +00:00
Mady Mellor
8bfb5b971d Merge "Changes based on API council feedback for performContextClick" into nyc-dev 
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ibf53f8081db8b847d18eaa8fee983b677b62f9bc
 2016-05-25 19:08:17 +00:00