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

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mady Mellor
20b7e8aa10 Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b 
am: 680f73bf46

* commit '680f73bf4643f57d3e1cc8791b186944a65ab9d9':
  Fix clipping not being activated on children in groups

Change-Id: I65a3ae33c0cb4934ed4a52d6e94194705fdac44c
 2016-05-25 20:40:30 +00:00
Mady Mellor
3f06d9ee97 Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f640607b 
am: d20923ba8a

* commit 'd20923ba8a1553a51f9a152cbd6fba9e5e5a2bca':
  Fix clipping not being activated on children in groups

Change-Id: Ie7e1640034d4bdb5111e533f7ed2b54139ef1b18
 2016-05-25 20:40:22 +00:00
Mady Mellor
d20923ba8a Merge "Fix clipping not being activated on children in groups" into nyc-dev 
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: Icf5c68956bb3c261ce27b195426ebd3aefe8b83b
 2016-05-25 20:35:51 +00:00
Mady Mellor
680f73bf46 Merge "Fix clipping not being activated on children in groups" into nyc-dev 
am: b6f640607b

* commit 'b6f640607b5b8124b1a1c216ea4264511b145774':
  Fix clipping not being activated on children in groups

Change-Id: I9bb55c13928be62641884d1381baf984c43acac6
 2016-05-25 20:35:45 +00:00
Michael Kwan
6b0351251e Update EditText break strategy for Theme.Micro. 
Change-Id: I59847023fc06447232377ebd4998175070b31737
 2016-05-25 13:29:38 -07:00
Mady Mellor
b6f640607b Merge "Fix clipping not being activated on children in groups" into nyc-dev 2016-05-25 20:22:42 +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
Zachary Kuznia
ec1783828e Ensure MotionEvent.split() won't be given an invalid value. 
b/27496784

Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
 2016-05-25 12:38:58 -07:00
Android Build Merger (Role)
69decb497f Merge "Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 am: e1b1fb1740" into nyc-mr1-dev-plus-aosp 2016-05-25 19:27:28 +00:00
Robert Carr
14b7bb0fbf Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75 
am: e1b1fb1740

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

Change-Id: I55f20d3c2c900f635f079dd85721c0028f9ae255
 2016-05-25 19:27:03 +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
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
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
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
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
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
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
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
Alex Klyubin
f2e0a719d0 Merge "Fix incorrect cleartext attribute" into mnc-mr-docs 2016-05-25 18:04:54 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Android Build Merger (Role)
b1f52d0b89 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 2016-05-25 17:53:46 +00:00
Chong Zhang
c97737c85f Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev am: 15818e1156 
am: b56ea680fc

* commit 'b56ea680fc3fa650370b539c229986f21d4ed512':
  Destroy saved surfaces if one of the last visible windows gets removed

Change-Id: I7860d2c6c4862dfbac060c76e74ca371435906e2
 2016-05-25 17:53:20 +00:00