Commit Graph

256895 Commits

Author SHA1 Message Date
Miao Wang
7ae30e18a4 Merge "Update documentation about copyTo and copyFrom." into nyc-dev
am: 1a523b7502

* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
  Update documentation about copyTo and copyFrom.

Change-Id: I0aa87cd4bde408ba5395ae3f951d86e10ece58de
2016-05-19 22:24:21 +00:00
John Reck
bfa719f448 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
2016-05-19 22:21:46 +00:00
Chih-Hung Hsieh
2bd7a3efc4 Fix misc-macro-parentheses warnings in common_time.
Bug: 28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
2016-05-19 15:21:42 -07:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw.
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
2016-05-19 15:19:22 -07:00
Miao Wang
75445fd6a0 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 2016-05-19 22:16:55 +00:00
John Reck
5527fd1323 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
2016-05-19 22:16:42 +00:00
Miao Wang
1a523b7502 Merge "Update documentation about copyTo and copyFrom." into nyc-dev 2016-05-19 22:16:38 +00:00
Sungki Kim
bcf8c61456 Merge "Fix GATT autoConnect race condition" am: 53ccfe848f am: 5dfe673be1
am: 51ab612ea9

* commit '51ab612ea9ad953dc78555401baf59ee4a577e2f':
  Fix GATT autoConnect race condition

Change-Id: If3f20f83b9e8cfd3031a84de1fbc787b9c8ee169
2016-05-19 22:16:31 +00:00
Chih-Hung Hsieh
0ca16ef3b8 Fix misc-macro-parentheses warnings in audio media jni.
Bug: 28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
2016-05-19 15:14:54 -07:00
Robert Carr
692a5feab9 Correctly clear resizing drawable when nulling background.
When a null window background is set, we want to use the
fallback drawable for resizing.

Bug: 28801472

Change-Id: Ia616d7aa18b0d7aa2c7081a85ce7551ecfeca5b3
2016-05-19 15:11:14 -07:00
Andre Eisenbach
51ab612ea9 Merge "Fix GATT autoConnect race condition" am: 53ccfe848f
am: 5dfe673be1

* commit '5dfe673be19ec469b1e62f4713c24f57b5ff27e2':
  Fix GATT autoConnect race condition

Change-Id: I236ba945e17ab8ba960d18a8225ff65f170180e0
2016-05-19 22:10:07 +00:00
smain@google.com
0f150a6901 fix dashboards page.
the src attributes were being modified by the devsite parser,
so i renamed those attributes then rename them again at runtime.
bug: 28801246

Change-Id: I34d0dff8fa7f430226dd1d12fccb2cdbeda365db
2016-05-19 15:08:51 -07:00
Sungki Kim
5dfe673be1 Merge "Fix GATT autoConnect race condition"
am: 53ccfe848f

* commit '53ccfe848f1b97cca12c7e5b496032e97594a8e2':
  Fix GATT autoConnect race condition

Change-Id: Ia761a72b003751146b83314facfdaf936b1f9e9b
2016-05-19 22:05:49 +00:00
Android Build Merger (Role)
07c716614c Merge "Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d am: df5056d531" into nyc-mr1-dev-plus-aosp 2016-05-19 22:04:36 +00:00
Phil Weaver
27d52f7627 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d
am: df5056d531

* commit 'df5056d531b71833a0b1e1784576f8c3a7954bb3':
  Fix a11y crash when window layer isn't unique.

Change-Id: I744856c410dc8137753efdbbe330bdad4c360f60
2016-05-19 22:04:03 +00:00
Phil Weaver
ea45ad0c08 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d
am: f2b72b3a9d

* commit 'f2b72b3a9d1576da77cfe1f7c38648c2c4e90314':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ic796c5149995c616e3d57b9ebf1f6d9f288dc07c
2016-05-19 22:04:01 +00:00
Bert McMeen
76372f02fe docs: Update to column widths for Complications table
Bug: 28864917
Change-Id: Ie02b5dd82789055b2a0994438065fc373ddf70b6
2016-05-19 15:01:38 -07:00
Andre Eisenbach
53ccfe848f Merge "Fix GATT autoConnect race condition" 2016-05-19 21:59:25 +00:00
Phil Weaver
df5056d531 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1
2016-05-19 21:57:55 +00:00
Phil Weaver
f2b72b3a9d Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ie5bfa1fcee7ec463190ef73311f20f3a6f087e82
2016-05-19 21:57:12 +00:00
Android Build Merger (Role)
3735009868 Merge "Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808 am: 1b3e08b4d1" into nyc-mr1-dev-plus-aosp 2016-05-19 21:51:29 +00:00
Robert Carr
0aee56c25a Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808
am: 1b3e08b4d1

* commit '1b3e08b4d125c8f609f1ae31f988f7618c53bdbe':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ied5c9a00c9ccf9422ecba2447209d52435694cb7
2016-05-19 21:51:01 +00:00
Robert Carr
be37945d8e Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808
am: 7b5f5c3188

* commit '7b5f5c3188b07c4ef1cb7bb5ab29bb7b17c7e80d':
  Never set resized while not drag resizing for pinned stack.

Change-Id: I4d6c4b6a8515621e9bb64aa5f8dacc5951572601
2016-05-19 21:50:59 +00:00
Phil Weaver
227d33439d Merge "Fix a11y crash when window layer isn't unique." into nyc-dev 2016-05-19 21:50:29 +00:00
Robert Carr
7b5f5c3188 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev
am: 1669d42808

* commit '1669d42808251eebddfe5e176eb8d322b84df636':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ifa2e3879a01f7ba906185b00d4b27ed3843dd315
2016-05-19 21:46:07 +00:00
Robert Carr
1b3e08b4d1 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev
am: 1669d42808

* commit '1669d42808251eebddfe5e176eb8d322b84df636':
  Never set resized while not drag resizing for pinned stack.

Change-Id: I5da72476c63c5f368e7ff8c1269308d206761ffd
2016-05-19 21:45:58 +00:00
TreeHugger Robot
1669d42808 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev 2016-05-19 21:42:21 +00:00
Selim Cinek
b5d6687c56 Fixed a bug where the scrim could flash black when snoozing huns
Because of an underflow the alpha could actually become 0xff instead
off 0 which would be visible as a black scrim. This was because of
our local updating of animators.

Change-Id: I4201a4bbfbc7cbf32819f4814c165d0e11adaadb
Fixes: 28840532
2016-05-19 14:38:10 -07:00
Jae Seo
bd6c16908d MediaBrowserService: Add more explanation on getBrowserRootHints()
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
2016-05-19 14:17:27 -07:00
Hemal Patel
a1ed45d7c8 Docs: Fixed a wrong file name
Bug: 26897599
Change-Id: I4a0bb6149e6a88bb9eda90b8bcc44909633f8399
2016-05-19 14:13:29 -07:00
Damien Bargiacchi
03be7972ee Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev
am: 96783005d7

* commit '96783005d7d2447d18ad17e430a90d213252c9a3':
  Start the Wear Time System Service with SystemServer

Change-Id: Ief7dcfd771a4a97ac23ed0617301043f92738b95
2016-05-19 21:02:43 +00:00
Damien Bargiacchi
60bacac2dd Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev
am: 9cb24e5582

* commit '9cb24e5582f7ec711400d2889baded061842b29b':
  Check clock accuracy before attempting to display clock

Change-Id: Icd74121f21e9ff2fbad210553b2661f71cd177dd
2016-05-19 21:01:30 +00:00
Damien Bargiacchi
96783005d7 Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev 2016-05-19 20:56:52 +00:00
Damien Bargiacchi
9cb24e5582 Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev 2016-05-19 20:56:52 +00:00
Android Build Merger (Role)
341afcaa47 Merge "Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89 am: b9d4cd81a3" into nyc-mr1-dev-plus-aosp 2016-05-19 20:55:06 +00:00
Selim Cinek
e8953c4ac7 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: b9d4cd81a3

* commit 'b9d4cd81a3a67bd239e818c2a8d409ddbb845a79':
  Fixed a bug where the chronometer was invisible

Change-Id: I79d3303106c1e3096fff79e6b782809586a2a580
2016-05-19 20:54:41 +00:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
2016-05-19 20:54:37 +00:00
Android Build Merger (Role)
3022c8eac3 Merge "Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev am: 0676196be2 am: b521c107ed" into nyc-mr1-dev-plus-aosp 2016-05-19 20:51:32 +00:00
Selim Cinek
a60a06aefc Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev am: 0676196be2
am: b521c107ed

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

Change-Id: I188705cfbf4ce711391ac85ea69938d069c1a655
2016-05-19 20:51:07 +00:00
Selim Cinek
b9d4cd81a3 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: Ib495f096b5b2bc758ce7224fae33ba1a44c027a2
2016-05-19 20:51:04 +00:00
Selim Cinek
0f27eeba1b Merge "Fixed a bug where the chronometer wasn\'t updating the time" into nyc-dev am: 0676196be2
am: 8e8aa4ec4d

* commit '8e8aa4ec4daa5ac46e9be921bc0dd34f812e1a97':
  Fixed a bug where the chronometer wasn't updating the time

Change-Id: Ibaf35c283513973a22dee6eb601493b01a5de573
2016-05-19 20:50:20 +00:00
Selim Cinek
e9b32c77f8 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: I8caf83fdb4a27e477e644123d349bc4951eda0dd
2016-05-19 20:49:24 +00:00
Vincent Palatin
a0116bf81f Fix notifications for USB PD enabled devices
The devices with USB PD support can have the data role and the power role of
their USB-C port reversed. Ensure the title of the notification and the content
of the USB selection dialog is correct in this case.

Testing done on Ryu with the following accessories:
- legacy A-C cable
- USB-C charger (5X)
- USB-PD charger (Zinger)
- Pixel 2 (in both roles)
- Type-C Macbook (in both roles)
- Nexus 5X (in both roles)
- Apple AV HDMI accessory
- LG USB-C screen/dock
- Honeybuns dock

Bug: 28310685
Bug: 24137353
Change-Id: Id7f358c40d8714fae68ca98a7eb067f62f18b0af
(cherry picked from commit 0be6800b0f)
2016-05-19 20:46:21 +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
Selim Cinek
b521c107ed 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: Idd72e636e42f59a17445694b4c4c97b47bf58e71
2016-05-19 20:45:18 +00:00
TreeHugger Robot
2486cb2c89 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev 2016-05-19 20:40:26 +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
Android Build Merger (Role)
958ddbbfb6 Merge "Merge "Fix RTL issue in delete dialog." into nyc-dev am: 7b5327fb67 am: a1f7505fb6" into nyc-mr1-dev-plus-aosp 2016-05-19 20:38:01 +00:00
Steve McKay
9335b716aa Merge "Fix RTL issue in delete dialog." into nyc-dev am: 7b5327fb67
am: a1f7505fb6

* commit 'a1f7505fb6ed9bfe06aca658c2a869314a67b299':
  Fix RTL issue in delete dialog.

Change-Id: I02e65c7b687dc66aacccd24be9d3fc8c1727eaab
2016-05-19 20:37:36 +00:00
Steve McKay
1349a28d71 Merge "Fix RTL issue in delete dialog." into nyc-dev am: 7b5327fb67
am: 0264097200

* commit '02640972007bf210fb8d888b4b4a64de6d1e26a4':
  Fix RTL issue in delete dialog.

Change-Id: I7916479ab526746cb701c7ff46f41f6021042c84
2016-05-19 20:37:06 +00:00