Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,546 Commits 3 Branches 0 Tags
09c511f039d9197da6a0fabdfadae47a10bbbeb1
Commit Graph

65371 Commits

Author SHA1 Message Date
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
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
Ricky Wai
e1855ce492 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev am: 1cb6f9d8a4 
am: 754ddca748

* commit '754ddca748d7a8d3e55f4d90c07ca140a7ed312d':
  Add resetKeyStore() in LockSettingsService

Change-Id: Ic5d0e880c85754a4c198597c80c7eacfa1b1516a
 2016-05-26 14:35:30 +00:00
Ricky Wai
754ddca748 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 
am: 1cb6f9d8a4

* commit '1cb6f9d8a4827d50e26bf83068a928e47c5c1f1e':
  Add resetKeyStore() in LockSettingsService

Change-Id: I6af43eb9f472c1d5a1f9356a9b618a183200e38e
 2016-05-26 14:03:51 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Ricky Wai
1cb6f9d8a4 Merge "Add resetKeyStore() in LockSettingsService" into nyc-dev 2016-05-26 13:46:26 +00:00
Seigo Nonaka
d34ca400c6 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
 2016-05-26 04:17:39 +00:00
Seigo Nonaka
b03e7217f3 Merge "Fix system locale propagation during user creation." into nyc-dev 
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
 2016-05-26 04:07:40 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
Adam Lesinski
0c2f681bdf Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a 
am: fbdf46f663

* commit 'fbdf46f66323e80d4e90e926d0f199b64bf71f14':
  Use app's best locale if they override LocaleList

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e
 2016-05-26 02:10:48 +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
Adam Lesinski
fbdf46f663 Merge "Use app\'s best locale if they override LocaleList" into nyc-dev 
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf
 2016-05-26 01:38:34 +00: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
TreeHugger Robot
fbf3a0964a Merge "Use app's best locale if they override LocaleList" into nyc-dev 2016-05-26 01:11:03 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Phil Weaver
f6a1e1fe05 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 
am: 0a16a8d1d6

* commit '0a16a8d1d6ee63519123857dc4f305c96de7198b':
  Improve accessibility window title behavior

Change-Id: I0b0f95fb78e342cd17a85c7077f6e13a44ed0045
 2016-05-26 00:24:59 +00:00
Phil Weaver
0a16a8d1d6 Merge "Improve accessibility window title behavior" into nyc-dev 
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: Iff0d61871f48a66510e1fab72adbfb062c01c203
 2016-05-26 00:19:19 +00:00
Phil Weaver
062d24f9ec Merge "Improve accessibility window title behavior" into nyc-dev 
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
 2016-05-26 00:18:34 +00:00
Phil Weaver
7ab1a4d286 Merge "Improve accessibility window title behavior" into nyc-dev 2016-05-26 00:11:25 +00:00
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList 
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
 2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07: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
Siyamed Sinir
1f4c99f7d8 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 
am: baf8284c62

* commit 'baf8284c62e708a2d7817319c9e5f8948f6e5f5f':
  Fix TextView layout reuse when maxLines is set

Change-Id: I0334f59dee1599a77c216a0a18e030247a41e55f
 2016-05-25 22:13:28 +00:00
Siyamed Sinir
baf8284c62 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: I7f1d3acb519a91388dbf03db28ee039b5d4b7b1c
 2016-05-25 22:09:31 +00:00
Siyamed Sinir
1a6f583c20 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 
am: e747160509

* commit 'e747160509e71a05430168b1c8a28400b6a18403':
  Fix TextView layout reuse when maxLines is set

Change-Id: Iaf30b66b1a328f34d31efe723e394d817f74d65f
 2016-05-25 22:08:22 +00:00
Siyamed Sinir
e747160509 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev 2016-05-25 22:03:06 +00:00
Robin Lee
c9c95aa244 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 
am: 72c2aec394

* commit '72c2aec394f6cb06e0c61d0da15a93bfcacbdc51':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Iab6ef414116d6bec4cf418d784de4c0797e5dbd4
 2016-05-25 21:33:20 +00:00
Alan Viverette
f2c95b865e Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 
am: 29c01336db

* commit '29c01336db4b2db5582904597559b14563543054':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Ief9107dfd244cb2bad45e0d6f3e183dc2d1fbd11
 2016-05-25 21:28:07 +00:00
Alan Viverette
72c2aec394 Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 
am: 29c01336db

* commit '29c01336db4b2db5582904597559b14563543054':
  Fix DatePicker.setMin/MaxDate()

Change-Id: I34440f70e6771a6e97cd46e78548167f02bb5e82
 2016-05-25 21:28:06 +00:00
Alan Viverette
29c01336db Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 2016-05-25 21:17:53 +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
Sunny Goyal
2034a76a6e Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev 
am: 6f84a27a75

* commit '6f84a27a7597a3bc34316baf2af2bda30a2d75de':
  Maintaining diff for all widget operations instead of just the Views update

Change-Id: Iae3f2a6fc040d4484788ba203e0e0b6a66ed5c48
 2016-05-25 20:54:11 +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
Sunny Goyal
6f84a27a75 Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev 2016-05-25 20:45:44 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Phil Weaver
2a7e4442bf Improve accessibility window title behavior 
Suppress the default, unlocalized strings from being read as title.

Bug: 28744278
Change-Id: Iea0f7d8fed3d6428ada725cf3ffa077ba974b74a
 2016-05-25 12:48:13 -07:00
Robert Carr
e19176832f Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 
am: 1d4f1cda2d

* commit '1d4f1cda2de08887ce7036fa8a6f76d5ff0b378f':
  Force pending transactions to flush before screenshot.

Change-Id: I618c4c794e0c26ead6995a8aa1ff3d0d42cc45a0
 2016-05-25 19:26:36 +00:00
Robert Carr
1d4f1cda2d Merge "Force pending transactions to flush before screenshot." into nyc-dev 
am: 39e8022a75

* commit '39e8022a75507be06179c3de7358cebb1bb22e06':
  Force pending transactions to flush before screenshot.

Change-Id: Ib8dd84af143226e2b62cdfa51066e68ba7802d28
 2016-05-25 19:21:34 +00:00
Robert Carr
e1b1fb1740 Merge "Force pending transactions to flush before screenshot." into nyc-dev 
am: 39e8022a75

* commit '39e8022a75507be06179c3de7358cebb1bb22e06':
  Force pending transactions to flush before screenshot.

Change-Id: I2dc18293c1507a7f427c3ad554d3f70467dac98d
 2016-05-25 19:21:16 +00:00
TreeHugger Robot
39e8022a75 Merge "Force pending transactions to flush before screenshot." into nyc-dev 2016-05-25 19:16:13 +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