Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272,773 Commits 3 Branches 0 Tags
fd949c63e440e3c55e78f344fdb9978a88561663
Commit Graph

6600 Commits

Author SHA1 Message Date
Kirill Grouchnikov
aaf7bdcdf9 Merge "Revert "One more pass over Javadocs of RemoteViews public APIs"" 2016-07-01 22:41:02 +00:00
Kirill Grouchnikov
da099bdeda Revert "One more pass over Javadocs of RemoteViews public APIs" 
This reverts commit 0747e4070b.

Change-Id: I5cb55778958e4e56450999165e251bd7890f2c25
 2016-07-01 22:39:56 +00:00
Kirill Grouchnikov
65aa5fa22d Merge "One more pass over Javadocs of RemoteViews public APIs" 2016-07-01 22:09:52 +00:00
Kirill Grouchnikov
0747e4070b One more pass over Javadocs of RemoteViews public APIs 
Change-Id: I56e398bd013dd967d1fb1c5fdeaa1077ea6b3a6b
 2016-07-01 17:24:32 -04:00
Alan Viverette
b7c60cb24f Merge \\\"Only clip PopupWindow in the vertical direction\\\" into nyc-dev am: 4b736ea56d am: a2beb44834 
am: bb3fc63947

Change-Id: I1ae838346c9125d08987dee62171619d6c96e96b
 2016-06-30 17:51:01 +00:00
Alan Viverette
bb3fc63947 Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am: 4b736ea56d 
am: a2beb44834

Change-Id: I554dcbd9eb011d84a61d49b0d48818d1e9905c00
 2016-06-30 17:43:46 +00:00
Alan Viverette
6259ae4592 Merge \\\"Exclude children from excess space distribution when using largest child\\\" into nyc-dev am: 7705d5fd6e am: 650cc68f10 
am: 0c359bad53

Change-Id: I116d4bd532751159c59f8178dead7503e562af85
 2016-06-30 17:36:40 +00:00
Alan Viverette
a2beb44834 Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev 
am: 4b736ea56d

Change-Id: Idf5aedfb2f19595b8317c7dca1640ff0caf31696
 2016-06-30 17:35:52 +00:00
Alan Viverette
0c359bad53 Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am: 7705d5fd6e 
am: 650cc68f10

Change-Id: I490421dd7f13deda634b669ca7b7bd7a51d2bfdf
 2016-06-30 17:31:11 +00:00
Alan Viverette
4b736ea56d Merge "Only clip PopupWindow in the vertical direction" into nyc-dev 2016-06-30 17:24:22 +00:00
Alan Viverette
650cc68f10 Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev 
am: 7705d5fd6e

Change-Id: I747b4dab5bfc31b2461b445d1d983ac95a05693d
 2016-06-30 17:19:41 +00:00
Alan Viverette
9705fa0602 Only clip PopupWindow in the vertical direction 
Bug: 29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
 2016-06-30 13:17:26 -04:00
TreeHugger Robot
7705d5fd6e Merge "Exclude children from excess space distribution when using largest child" into nyc-dev 2016-06-30 17:07:07 +00:00
Alan Viverette
070b22bdee Exclude children from excess space distribution when using largest child 
Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
 2016-06-30 11:15:36 -04:00
Siyamed Sinir
24ae4b6d1b Merge "Fix bidi desired width calculation" 2016-06-29 01:42:34 +00:00
Siyamed Sinir
79bf9d19f2 Fix bidi desired width calculation 
Layout.getDesiredWidth measured text with TextDirectionHeuristics.LTR,
whereas the real calculations used the active direction heuristic set
in the TextView instance. This CL uses the same heuristics for both of
them by passing the value to Layout.getDesiredWidth function.

Bug: 28845953
Change-Id: I68d23f55fe5a86255d62e83bc62df38a047e4bca
 2016-06-28 14:01:18 -07:00
Kirill Grouchnikov
1c6e6dcfd7 Merge "Fix RemoteViews Javadocs for a couple of methods." 2016-06-28 20:35:35 +00:00
Kirill Grouchnikov
c5b30108bb Fix RemoteViews Javadocs for a couple of methods. 
Change-Id: Ie87003bcb0d0c43185e5482e91faee84a798aaee
 2016-06-28 15:34:13 -04:00
Kirill Grouchnikov
55ec63ec33 Merge "Fix a typo in Javadocs" 2016-06-28 15:57:43 +00:00
Chris Banes
612390dce6 Merge "Make Toolbar ignore its minHeight if larger than height" 2016-06-28 15:52:55 +00:00
Kirill Grouchnikov
9091df0fe2 Fix a typo in Javadocs 
Change-Id: I450b2b239bd405c58b9f63663ebdf8f73ea38ae5
 2016-06-28 11:24:04 -04:00
Chris Banes
8053117a3d Make Toolbar ignore its minHeight if larger than height 
Currently Toolbar lays out all children based on its
minHeight (if set). If that minHeight is larger than
the Toolbar height, then the children are laid out larger
than the Toolbar and clipped.

This CL fixes it back by capping the alignment height.

BUG: 29049143

Change-Id: Ia3389a906b132bb0a2ae41b27116c00744d0ddf4
 2016-06-28 09:38:29 +01:00
Yohei Yukawa
a3fd8bfdfe Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp 
am: c58ffb3f9c

Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
 2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev 
am: cb56978912

Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
 2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00
Kirill Grouchnikov
82943ab208 Merge "Don't double-invoke scroll ended listener in animate*" 2016-06-27 19:18:00 +00:00
Kirill Grouchnikov
3c242c3d25 Don't double-invoke scroll ended listener in animate* 
Bug: 29754254
Change-Id: I8e7a997f93c83ddee4e923ca3990c4a8d9732c63
 2016-06-27 12:10:31 -04:00
Robert Carr
9b23b04d60 Merge \\\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\\" into nyc-dev am: 8afc1f70f0 am: be87ca9efa 
am: e1eba6c1b7

Change-Id: I43a029fe125c8959bc1490fa76841b48a2bced2f
 2016-06-24 22:59:53 +00:00
Robert Carr
e1eba6c1b7 Merge \\"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\\" into nyc-dev am: 8afc1f70f0 
am: be87ca9efa

Change-Id: I1d06d427c3679d83d55038f999b75c26d5c8ecc6
 2016-06-24 22:54:53 +00:00
Robert Carr
be87ca9efa Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev 
am: 8afc1f70f0

Change-Id: Ifcc58b9c6a4bdaf3df0dc49ac963bdc7e32aa409
 2016-06-24 22:50:45 +00:00
Robert Carr
c6413cc919 Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev 
am: 8afc1f70f0

Change-Id: Iabd270da70c540b9da38a72895adc6904bbb41cd
 2016-06-24 22:50:39 +00:00
Robert Carr
489c39d2db PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL. 
When we want the WindowManager to clip our requested width/height
to the display frame, we need to pass DISPLAY_CLIP_VERTICAL/HORIZONTAL.
It seems this behavior was unintentionally applied without this flag
in previous releases.

Bug: 29602363
Change-Id: Ib98060e36efde0dbaabb59a758da5374035dbb62
 2016-06-24 14:07:20 -07:00
Yohei Yukawa
45700fa135 Use a flag to grant a temporary URI permission. 
It turns out that we can let the system to call
InputMethodService#exposeContent(InputContentInfo, EditorInfo), which
added in my previous CL [1], during the IME is calling
InputConnection#commitContent() as follows.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  getCurrentInputConnection().commitContent(
          inputContentInfo,
          InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION,
          null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

This gives us flexibility to let InputConnection#commitContent() do all
the magic for IME developers like other APIs such as
Context#startActivity(), rather than asking them to call one more API to
grant a temporary URI permission like a scenario where
Context#grantUriPermission() is used.

 [1]: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
      25e0813e6e

Bug: 29450031
Change-Id: I99536cd58c9984af30b0bafb4a1dd25a26634a2d
 2016-06-23 17:12:59 -07:00
Alan Viverette
59d045e7a0 Merge \\\"Clarify docs for PopupWindow width/height parameters\\\" into nyc-dev am: 22f887a014 am: 483a8dc097 
am: 23f6f62ea4

Change-Id: Id34e978aa6a26e08bab147ea3e1aa3a6282227af
 2016-06-23 01:12:46 +00:00
Alan Viverette
23f6f62ea4 Merge \\"Clarify docs for PopupWindow width/height parameters\\" into nyc-dev am: 22f887a014 
am: 483a8dc097

Change-Id: I906d49ae22e3368792928910310f5ddc341edf8f
 2016-06-23 01:06:15 +00:00
Alan Viverette
54e12ac7f5 Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev 
am: 22f887a014

Change-Id: I7311e8cb98da040148e961734646251949975270
 2016-06-23 01:00:32 +00:00
Alan Viverette
483a8dc097 Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev 
am: 22f887a014

Change-Id: I84d345cde0d16e98ce3fefa703929f243a5fdced
 2016-06-23 01:00:18 +00:00
Alan Viverette
22f887a014 Merge "Clarify docs for PopupWindow width/height parameters" into nyc-dev 2016-06-23 00:55:52 +00:00
Robert Carr
538b49b85f Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev am: 72ce991692 am: 5a35355364 
am: b964f26d7a

Change-Id: I45539980837dec09d0cde9fd84d256531ed1ebdc
 2016-06-22 00:12:18 +00:00
Robert Carr
b964f26d7a Merge \\"Don\\'t try and resolve WRAP_CONTENT too early.\\" into nyc-dev am: 72ce991692 
am: 5a35355364

Change-Id: I80c0d1fc372efcff69b49ac485bce460d542c044
 2016-06-21 23:40:26 +00:00
Robert Carr
d748b54615 Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev 
am: 72ce991692

Change-Id: I277968e2a48ac5647db0f03877ab168afc245a6c
 2016-06-21 23:35:11 +00:00
Robert Carr
5a35355364 Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev 
am: 72ce991692

Change-Id: Id020f8282da4b13da91921c459b1b65d6fa8552d
 2016-06-21 21:30:53 +00:00
Alan Viverette
c129b58ad1 Clarify docs for PopupWindow width/height parameters 
Bug: 29496188
Change-Id: I1e9b74880f4ea0454971f0d7d6eb4765b64db98f
 2016-06-21 11:09:03 -04:00
Kirill Grouchnikov
ede9ad62c8 Merge "Enforce the contract laid out in Javadocs" 2016-06-21 12:28:47 +00:00
Chris Banes
ae1f719ffc Fix NPE in Toolbar - framework edition am: 3b925c1ab0 
am: 09bf9e69bc

Change-Id: I17d47807646ea38d5565238d17ef6b34715a822a
 2016-06-21 08:21:35 +00:00
Chris Banes
09bf9e69bc Fix NPE in Toolbar - framework edition 
am: 3b925c1ab0

Change-Id: I340ddff981e938bf6f9bd3f1392eec03f25f3e5d
 2016-06-21 08:16:28 +00:00
Chris Banes
3b925c1ab0 Fix NPE in Toolbar - framework edition 
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.

BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
 2016-06-21 08:09:24 +00:00
Robert Carr
07421cb9bb Don't try and resolve WRAP_CONTENT too early. 
At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
 2016-06-20 15:55:02 -07:00
Kirill Grouchnikov
c4d5e120c7 Enforce the contract laid out in Javadocs 
Make sure that copy constructors respect the contract stated
in the Javadocs that all child views have their width forced
to MATCH_PARENT.

Also copy weight field if the copy constructor gets another
instance of TableLayout.LayoutParams

Bug: 29502952
Change-Id: I27bf581179f528c9ad2e15ab448ba1f044696473
 2016-06-20 12:35:28 -04:00
Seigo Nonaka
b115719dd4 Remove unnecessary log message. 
This message was introduced locally for debugging but unexpectedly
upstreamed to master branch.

Change-Id: I6a6da19f6e41b22ed6f7da85ffcc23861852c248
 2016-06-20 14:36:26 +09:00