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

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mady Mellor
d3c40aec10 Merge "Changes based on API council feedback for performContextClick" into nyc-dev am: 7c17e70f2f am: 3425c6c62c 
am: b163f82e35

* commit 'b163f82e3564aafe5bec7354d3d0558835421ead':

Change-Id: Ie691c339d8035db4f6ff1e94bccc258fac72d5ec
 2016-05-25 19:22:30 +00:00
Philip P. Moltmann
ba3f50727d Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb am: 6b7635f774 
am: 6972297f8c

* commit '6972297f8c37e9f391307df005d0eff811429a13':

Change-Id: I920de85964296395f8501ad795859b36b1db5d60
 2016-05-25 19:22:19 +00:00
Mady Mellor
3baaea4e5e Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb am: 8bfb5b971d 
am: 27f54d6001

* commit '27f54d600109a68c6bf42848118448f1d59727e1':
  Changes based on API council feedback for performContextClick

Change-Id: I86569c06e5b587ddd9172e4e8e2d8efa98f209d4
 2016-05-25 19:22:06 +00:00
Philip P. Moltmann
a0a8a033b8 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 am: 5e10a2b388 
am: 1b2310442a

* commit '1b2310442a3a93a5cb162da6ff9bb28e193d17f5':
  Add Samsung print recommendation plugin.

Change-Id: I3957909cb56f4e4a62d1cd6f1a048f81444b3f0f
 2016-05-25 19:21:53 +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
Mady Mellor
b163f82e35 Merge "Changes based on API council feedback for performContextClick" into nyc-dev am: 7c17e70f2f 
am: 3425c6c62c

* commit '3425c6c62c85f9ed18c2268627c64eb7f10e15be':

Change-Id: I863672ff3019cd8d93f1f68857b3d146621105d7
 2016-05-25 19:16:58 +00:00
Philip P. Moltmann
6972297f8c Merge "Add Samsung print recommendation plugin." into nyc-dev am: b4a45472bb 
am: 6b7635f774

* commit '6b7635f774bf14574e23adcb7ed4d580a2c06523':

Change-Id: I0c99e44fc1feabcbc5ab302f3d4361c73be0659f
 2016-05-25 19:16:53 +00:00
TreeHugger Robot
39e8022a75 Merge "Force pending transactions to flush before screenshot." into nyc-dev 2016-05-25 19:16:13 +00:00
Chad Brubaker
97034e8ba4 Merge "Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 am: 5dccdf9174" into nyc-mr1-dev-plus-aosp 
am: 8d0ac33000

* commit '8d0ac3300055ac77d507c151ea7fcbc4172588e7':

Change-Id: Ide4f89f03f800d2ec9ae2589ef3475afa9617f8f
 2016-05-25 19:15:27 +00:00
Alex Klyubin
68143b862c Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 am: 85b5a076d4 
am: 877b81c7b1

* commit '877b81c7b16aeef283b78b20849f7b3aec19c829':
  Fix incorrect cleartext attribute

Change-Id: Ie90158cbbf355d1e47bc27de771f05dc97e934e2
 2016-05-25 19:15:14 +00:00
Selim Cinek
d9db710404 Merge "Fixed a bug where the expand button was invisible" into nyc-dev am: 6088cf67e8 am: f3de85d46f 
am: 21fa97b766

* commit '21fa97b766b42dd53e8f6bf137e13c821dd11cf9':

Change-Id: I54056e87ec575a08782d866b6c52e647f1e3be70
 2016-05-25 19:14: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
Chad Brubaker
1b2310442a Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 
am: 5e10a2b388

* commit '5e10a2b388a0ee994228ab9bb328e9ea9c5a061e':
  Add Samsung print recommendation plugin.

Change-Id: I572d7e43d327721ce22776e4e550c23a557a6e77
 2016-05-25 19:14:11 +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
Philip P. Moltmann
6b7635f774 Merge "Add Samsung print recommendation plugin." into nyc-dev 
am: b4a45472bb

* commit 'b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
  Add Samsung print recommendation plugin.

Change-Id: I88c72b3c3ce3a190af297c78373fbfd7e2f61ef7
 2016-05-25 19:10:37 +00:00
Android Build Merger (Role)
8d0ac33000 Merge "Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 am: 5dccdf9174" into nyc-mr1-dev-plus-aosp 2016-05-25 19:08:47 +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
Chad Brubaker
70ec14e4bb Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 
am: 5dccdf9174

* commit '5dccdf917413b1d677368276bac03a9938d472b8':
  Fix incorrect cleartext attribute

Change-Id: Ib6e8edad00d9191f7096fe49e067d301abe037c0
 2016-05-25 19:08:14 +00:00
Philip P. Moltmann
5e10a2b388 Merge "Add Samsung print recommendation plugin." into nyc-dev 
am: b4a45472bb

* commit 'b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
  Add Samsung print recommendation plugin.

Change-Id: I158aded0febc7790132e790a00b0603ed246400c
 2016-05-25 19:08:12 +00:00
Chad Brubaker
877b81c7b1 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 
am: 85b5a076d4

* commit '85b5a076d40fe852303f10dd9c809786b8c33d11':
  Fix incorrect cleartext attribute

Change-Id: I43cc3d63693996997aa28e04291e103806b95d97
 2016-05-25 19:08:06 +00:00
Selim Cinek
df7d8b040d Merge "Fixed a bug where the expand button was invisible" into nyc-dev am: 6088cf67e8 am: f3018bc581 
am: 0c7f3ea00d

* commit '0c7f3ea00dade1b1e481adb1081a9a1e9b9b4a7f':
  Fixed a bug where the expand button was invisible

Change-Id: Iac09d6f897c3133949184ab4ac4bec7f71cf4be6
 2016-05-25 19:02:01 +00:00
Alex Klyubin
5dccdf9174 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b 
am: 56f2f91793

* commit '56f2f91793e8eb296ba8826deaaacd77b2081d64':
  Fix incorrect cleartext attribute

Change-Id: I3c12ead21003a47b537b5e3746b6cfe16848fbff
 2016-05-25 19:01:33 +00:00
Alex Klyubin
85b5a076d4 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b 
am: 56f2f91793

* commit '56f2f91793e8eb296ba8826deaaacd77b2081d64':
  Fix incorrect cleartext attribute

Change-Id: I07954d6b54c4b736ebcd97f0ee442133f685e129
 2016-05-25 19:01:27 +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
Selim Cinek
21fa97b766 Merge "Fixed a bug where the expand button was invisible" into nyc-dev am: 6088cf67e8 
am: f3de85d46f

* commit 'f3de85d46f7f7b4c5c1ef6b8cacdb80ede8b3867':

Change-Id: Ic7612847f0a12a4f96eee4b2b84524fd1ff04f4d
 2016-05-25 18:54:57 +00:00
Philip P. Moltmann
b4a45472bb Merge "Add Samsung print recommendation plugin." into nyc-dev 2016-05-25 18:51:12 +00:00
Selim Cinek
f3de85d46f Merge "Fixed a bug where the expand button was invisible" into nyc-dev 
am: 6088cf67e8

* commit '6088cf67e8895b5ae09e8d99d57f9ae9279a2470':
  Fixed a bug where the expand button was invisible

Change-Id: Ie34550e3dc313949cceb66afd40ccfd22cd7ddd8
 2016-05-25 18:39:51 +00:00
Ben Lin
ddc35c5f3c Fixing some tests for Phone form-factor. 
Bug: 27533946
Change-Id: I70e15dee2ae7c14c1768d56ee04f87d05dd0f926
(cherry picked from commit 316c39b94c129652e7569fc7e4cd47af3cfb80d3)
 2016-05-25 18:39:46 +00:00
Selim Cinek
0c7f3ea00d Merge "Fixed a bug where the expand button was invisible" into nyc-dev am: 6088cf67e8 
am: f3018bc581

* commit 'f3018bc58122ee712a0a988e18b71fc66f9093b2':
  Fixed a bug where the expand button was invisible

Change-Id: Ic19a3c0d7001cbd52a752c921c46d4e238c58614
 2016-05-25 18:39:05 +00:00
Chris Banes
78598b878f Merge "Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f am: 62eec265ee" into nyc-mr1-dev-plus-aosp 
am: ab690b2cc8

* commit 'ab690b2cc81396bddc5fbd4a2ca900a8ac9c2140':

Change-Id: I7838ca1771627b4d7c84de1e76072e134ae49a5b
 2016-05-25 18:37:06 +00:00
Derek Tan
818822ad5d Per API review, revert the API renaming CL. 
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b5605.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
 2016-05-25 18:37:05 +00:00
Chad Brubaker
56f2f91793 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 
am: d1df52a46b

* commit 'd1df52a46beb5babd0d9f3257b2ade53c9c763cf':
  Fix incorrect cleartext attribute

Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
 2016-05-25 18:36:47 +00:00
Chris Banes
ba0029c56f Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f am: def151052c 
am: f34dec952e

* commit 'f34dec952eebe2d591cfd2f84f9c6a46ced39dca':
  Fix text appearances not working in colored button styles

Change-Id: I1e57c83ba59c6394a45de292d65de5735547a21f
 2016-05-25 18:36:26 +00:00
Selim Cinek
f3018bc581 Merge "Fixed a bug where the expand button was invisible" into nyc-dev 
am: 6088cf67e8

* commit '6088cf67e8895b5ae09e8d99d57f9ae9279a2470':
  Fixed a bug where the expand button was invisible

Change-Id: Ia7bfba0e245781f80bb1d7a9a068f765661177a7
 2016-05-25 18:25:33 +00:00
Alex Klyubin
d1df52a46b Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 
am: 56f32483b0

* commit '56f32483b04723bf750e51badcfec3203c352d32':
  Fix incorrect cleartext attribute

Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
 2016-05-25 18:24:31 +00:00
Android Build Merger (Role)
ab690b2cc8 Merge "Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f am: 62eec265ee" into nyc-mr1-dev-plus-aosp 2016-05-25 18:21:14 +00:00
Chris Banes
26e9ffbca0 Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f 
am: 62eec265ee

* commit '62eec265eed52a1fc33d5a7ded383d84a53d4810':
  Fix text appearances not working in colored button styles

Change-Id: Ice1a77be3eef649f6b78b25c8310bd8903eb9c76
 2016-05-25 18:20:30 +00:00
Chris Banes
f34dec952e Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f 
am: def151052c

* commit 'def151052c2e48a3f0e8de8dbab65db4e953abeb':
  Fix text appearances not working in colored button styles

Change-Id: I3f47630eaf5bc2893b845ad141087d2a2a7011f5
 2016-05-25 18:20:27 +00:00
Sid Soundararajan
17d29b6d70 Alternate method for adding dismiss in talkback 
This is an alternate solution. Not sure if this is better than
the current solution.

BUG: 28594452
Change-Id: I08b4ca8741ceb3491950ba779510b08775bd0ee7
 2016-05-25 11:18:22 -07:00
Chad Brubaker
56f32483b0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 
am: f2e0a719d0

* commit 'f2e0a719d00c4a7c6865f6784efc9b3f88421136':
  Fix incorrect cleartext attribute

Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
 2016-05-25 18:16:03 +00:00
Selim Cinek
6088cf67e8 Merge "Fixed a bug where the expand button was invisible" into nyc-dev 2016-05-25 18:14:57 +00:00
Muyuan Li
29044bd7dc Merge "sysui: refactor for extensibility." 2016-05-25 18:13:54 +00:00
Chong Zhang
3d17d587da Merge "Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 am: b56ea680fc" into nyc-mr1-dev-plus-aosp 
am: b1f52d0b89

* commit 'b1f52d0b89f4eb93f36cf5be9c7cc447c3730c35':

Change-Id: I8a148670b8d89e83e8686c862d200a760cc18064
 2016-05-25 18:10:12 +00:00
Garfield, Tan
6d0b46eb12 Separate paste code from DirectoryFragment. 
Also untie DocumentClipper from activities. We'll have a single
DocumentClipper across the app from now on.

Bug: 28742120
Change-Id: Ib9e2537c3499ba2fa0a203ddad3ae71246d5b009
(cherry picked from commit 0cd92d35c533c16b301bd228cce8c68a289407a1)
 2016-05-25 18:07:51 +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
Chris Banes
def151052c Merge "Fix text appearances not working in colored button styles" into nyc-dev 
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: I229589acdd58746f4a230643ae025fa4639a7991
 2016-05-25 18:05:52 +00:00
Chris Banes
62eec265ee Merge "Fix text appearances not working in colored button styles" into nyc-dev 
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: Ib26212b58dde81eeb222721d39df7ce66502265b
 2016-05-25 18:05:21 +00:00