Commit Graph

6496 Commits

Author SHA1 Message Date
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00
Selim Cinek
828d701667 Merge "Fixed the relative time spoken with accessibility" into nyc-dev
am: 38b5946fae

* commit '38b5946fae50d4e9e8f32c985983d03a4437910d':
  Fixed the relative time spoken with accessibility

Change-Id: I51bbe71d2b86cfb8f050882b072092a015573fdb
2016-05-27 03:27:43 +00:00
Selim Cinek
38b5946fae Merge "Fixed the relative time spoken with accessibility" into nyc-dev 2016-05-26 22:33:51 +00:00
Selim Cinek
570bfa2768 Fixed the relative time spoken with accessibility
The relative time was unclear for certain locales
and even worse 1m was spoken as 1 meter.

Change-Id: Ie172092da27ea8119906b0c301b5569bf3efabbb
Fixes: 28961667
2016-05-25 18:44:44 -07:00
Siyamed Sinir
4001c11816 Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: baf8284c62
am: 1f4c99f7d8

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

Change-Id: I52420052fbc85c346e861d66841d2b7aee4ac1ca
2016-05-25 22:25:50 +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
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
Alan Viverette
f9d8433bf0 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: 72c2aec394
am: c9c95aa244

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

Change-Id: I5a45259ee1a21667d72f216b5b394e6450c2d03f
2016-05-25 21:50:36 +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
29c01336db Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev 2016-05-25 21:17:53 +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
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Alan Viverette
7ac0f32c16 Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87
Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
2016-05-25 13:16:08 -04: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
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
Abodunrinwa Toki
ecea7285ac Merge "Filter ACTION_PROCESS_TEXT entries by exported status and permission." 2016-05-25 11:33:06 +00:00
Seigo Nonaka
eacdbd0357 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe am: 7b77768d39
am: 48cb2ee07b

* commit '48cb2ee07b0730522bb5cac0a302f30498fe7312':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I6ad7a97a431b7fc512f7e674f7f2f9628dd16c0c
2016-05-25 03:41:39 +00:00
Seigo Nonaka
48cb2ee07b Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe
am: 7b77768d39

* commit '7b77768d39fdc1de95bbf32a809b52eb26c9e10d':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Iadf842b82cb178bcaf69c7790051ae3f17b5bd34
2016-05-25 03:37:22 +00:00
Seigo Nonaka
9995396b26 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I77ed2205c4dc34786c1b931a00f64187a878395e
2016-05-25 03:30:06 +00:00
Seigo Nonaka
7c8305bcfe Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 2016-05-25 03:24:11 +00:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Abodunrinwa Toki
5ba060b49a Filter ACTION_PROCESS_TEXT entries by exported status and permission.
Bug: 26638966
Change-Id: Ib06e914935fa5bde576555a0b7258d0faddaef13
2016-05-24 21:56:34 +01:00
Siyamed Sinir
0923b063c4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 8ae06f6f3a
am: 68d3077e9a

* commit '68d3077e9a11c96d118834563fa283b3ead4f1a7':
  setTransformationMethod should reset mTextDir

Change-Id: I46a1f5e356992bd08ba440fce0e15b952541d547
2016-05-20 18:07:06 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
2016-05-20 18:02:39 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
2016-05-20 17:53:44 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Siyamed Sinir
d55be2b9d5 setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.

Bug: 28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
2016-05-19 18:30:38 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Selim Cinek
8e8aa4ec4d Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev
am: 0676196be2

* commit '0676196be2657fdf265fa7ad1eae3eecf1bbfebc':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: I16327b27bcfce8eaeb18cbddd420bb134cff1e45
2016-05-19 20:45:20 +00:00
TreeHugger Robot
0676196be2 Merge "Fixed a bug where the chronometer wasn't updating the time" into nyc-dev 2016-05-19 20:39:34 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Selim Cinek
a2a0171e7c Fixed a bug where the chronometer wasn't updating the time
When the countdown was set to true and the chronometer was set to
count down it wasn't updating the time, which is now fixed.

Change-Id: I4887d9eb09193c5636070edee9ba1bd13b9a23b5
Fixes: 28829131
2016-05-18 16:59:07 -07:00
Sunny Goyal
64148406d1 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev am: d2d8e9b228
am: fcdbde4caa

* commit 'fcdbde4caa547087d82830647517c411e216626f':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: Ia4cd711147fa865a18177f98b792181d71c71acd
2016-05-18 23:24:36 +00:00
Sunny Goyal
d2d8e9b228 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 2016-05-18 23:13:00 +00:00
Sunny Goyal
49e6695c5c Store the appropriate layout id for the infrated view, so that
it can be used for verification during reapply.

Bug: 28815495
Change-Id: I8516661ef97f529851069331a6c2bb64429c7766
2016-05-18 16:11:11 -07:00
Yohei Yukawa
af15c8bcae Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
am: bf4c8f730b

* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
  Move LocaleList to avoid layering violation.

Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Seigo Nonaka
e9f54bfde2 Use original theme for SuggestsionsPopupWindow
Some application set textColorPrimary as white, as the result the
suggestion window draws white text on white background.
To avoid this UX, always uses original theme for suggestions popup
window.

Bug: 28371168
Change-Id: I2ef41d162b63a7e277decc2065609a7d43590afe
2016-05-17 13:53:21 +09:00
Alan Viverette
1782b8e7db Merge "Use standalone capitalization for month labels" into nyc-dev am: 895241170b am: cee6b62ce8
am: a9c50001aa

* commit 'a9c50001aa0928f879d29c2dbbdd67591d510c47':
  Use standalone capitalization for month labels

Change-Id: I34b06d007ffb330576278865cf7935e2f3f9cab6
2016-05-16 19:49:56 +00:00
Alan Viverette
c3e5a82691 Use standalone capitalization for month labels
Bug: 28020439
Change-Id: I85169a78142a43ff2348e0b561a7aa995544a65e
2016-05-16 13:35:56 -04:00
Ian Rogers
9ac4734714 Merge "Remove @Nullable from primitive/void types." 2016-05-12 18:53:05 +00:00
Alan Viverette
554b420568 Merge "Remove extra logging in DatePicker" into nyc-dev am: c952b035b2 am: a6c89dd6a0
am: 4f440347f5

* commit '4f440347f5df680e982dc530c50c763b1fa438f3':
  Remove extra logging in DatePicker

Change-Id: Ic299258ab626085c28277e9e67a81c7f6c76186f
2016-05-12 15:07:32 +00:00
Alan Viverette
c952b035b2 Merge "Remove extra logging in DatePicker" into nyc-dev 2016-05-12 14:57:58 +00:00
Yigit Boyar
10536069c1 Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca am: c8777a833a
am: cac41c969f

* commit 'cac41c969f9c465b99e74d8ca87eb0d1237c4c52':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I6cd68f318a4110322c109a32a49d67cb2a7e0d14
2016-05-12 00:42:13 +00:00