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

65341 Commits

Author SHA1 Message Date
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
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
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
Siyamed Sinir
f75775ea7f Fix TextView layout reuse when maxLines is set 
When maxLines is set on StaticLayout and the text is wrapped, during
onMeasure TextView couldn’t recognize the wrap in the layout and tried
to reuse the layout which in turn caused width calculation problems.
This CL checks if maxLines is set, and if there is a text cut-off in
order to reuse existing layout.

Bug: 28468120
Change-Id: Ide43df8512a09112715067cbadf29cc64fd53247
 2016-05-25 12:01:23 -07:00
Mady Mellor
7c17e70f2f Merge "Changes based on API council feedback for performContextClick" into nyc-dev 2016-05-25 19:00:08 +00:00
Antonio Cansado
904237f839 Cleaning up NetworkStatsManager. 
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs

Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
 2016-05-25 11:07:41 -07:00
Julia Reynolds
88be37e50a Merge changes from topic \'cps\' into nyc-dev am: d3827be162 
am: 5bf51f026c

* commit '5bf51f026cddca00b156f93089cb803e4c612d96':
  Api updates.
  Note timezone changes.

Change-Id: Ic175b68e0c8000c1fe613f0e213631d7e1275f2d
 2016-05-25 17:21:58 +00:00
Julia Reynolds
39c013811e Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: I52055d3a5193bed6392327bd5df82dc7880c5ce7
 2016-05-25 17:16:01 +00:00
Julia Reynolds
5bf51f026c Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
 2016-05-25 17:15:07 +00:00
Julia Reynolds
d3827be162 Merge changes from topic 'cps' into nyc-dev 
* changes:
  Api updates.
  Note timezone changes.
 2016-05-25 17:09:26 +00:00
Julia Reynolds
ad41a6f0de Api updates. 
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
 2016-05-25 13:02:50 -04:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick 
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
 2016-05-25 09:52:51 -07:00
Alan Viverette
75dfc87e5e Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c 
am: b9878f0c5a

* commit 'b9878f0c5aab4b540180fb7e36a8e0b41b5e50c2':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I6c9f2c9208cb46ccb4e83f196dfa8ff8ae5ec710
 2016-05-25 16:46:59 +00:00
Alan Viverette
3fb5c7b8fa Fix DatePicker.setMin/MaxDate() 
Previously it would only allow year changes, which... doesn't make sense.

Bug: 28953902
Change-Id: I9b15b96662d9d496e11fb426ff23f14b26e90800
 2016-05-25 12:34:55 -04:00
Alan Viverette
ffa81d0440 Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev 
am: cfbca5640c

* commit 'cfbca5640ca435e1b501254c9cf8b66746799d7e':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I2db34c1d97d289ccbc2498a5084486aa726e6dcb
 2016-05-25 16:24:57 +00:00
Alan Viverette
b9878f0c5a Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev 
am: cfbca5640c

* commit 'cfbca5640ca435e1b501254c9cf8b66746799d7e':
  Use ICU's Calendar class in date picker & related classes

Change-Id: Ideb570415bab784778bb12709d04a37ad3c29275
 2016-05-25 16:24:51 +00:00
Alan Viverette
cfbca5640c Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev 2016-05-25 16:20:16 +00:00
Alan Viverette
68763be41c Use ICU's Calendar class in date picker & related classes 
Also organizes imports.

Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
 2016-05-25 11:42:42 -04:00
Ricky Wai
750229fdf0 Hide work profile key in user credentials screen am: d398244513 
am: ed39b3b166

* commit 'ed39b3b1666cff34e34c394029fad0ad9e426968':
  Hide work profile key in user credentials screen

Change-Id: I18cefc9f365ed83db5262676a1f4b9cc28b20c07
 2016-05-25 13:27:41 +00:00
Ricky Wai
cdb948c81c Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd 
am: 2281b83051

* commit '2281b83051f8f2d14dfc0a366ed54b1716370412':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: Ia43caa8b23eced60a8ef187ed100b106aedb74a3
 2016-05-25 13:23:24 +00:00
Ricky Wai
ed39b3b166 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I5273b53b07cb80d45bac61c8dcc5cba8f6b11b3a
 2016-05-25 13:20:51 +00:00
Ricky Wai
276f168f10 Hide work profile key in user credentials screen 
am: d398244513

* commit 'd398244513c62c9ea14a0f1c6ffef832e803c16f':
  Hide work profile key in user credentials screen

Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
 2016-05-25 13:18:26 +00:00
Ricky Wai
2281b83051 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
 2016-05-25 13:15:33 +00:00
Ricky Wai
fdf928d4b5 Do not allow DPM.resetPassword() when child profile exists or user is locked 
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I05277051a8f30c4d020440dd01b5dc284d552fd4
 2016-05-25 13:14:23 +00:00
Ricky Wai
d398244513 Hide work profile key in user credentials screen 
Bug: 28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
 2016-05-25 13:11:09 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked 
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
 2016-05-25 13:09:44 +00:00
Yohei Yukawa
e5befc5221 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1 
am: ef68474698

* commit 'ef684746980061bb5950ae2505229648d9f146d6':
  Make IMM more robust to spurious window focus-in

Change-Id: I77ae5953aa9afc64ef1cd3252d6d2ff936890b62
 2016-05-25 05:02:09 +00:00
Yohei Yukawa
ef68474698 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I1d9a138798d982f2164907b49713a7b90cec9adc
 2016-05-25 04:58:20 +00:00
Yohei Yukawa
e8ae33f6e6 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 
am: 50c33d1ca1

* commit '50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
  Make IMM more robust to spurious window focus-in

Change-Id: I3c80320a5c6711bf3aaeb3043fe54c741c127966
 2016-05-25 04:57:43 +00:00