Commit Graph

249922 Commits

Author SHA1 Message Date
Diego Perez
8fc7ca05e5 Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev 2016-05-11 15:53:15 +00:00
Adrian Roos
db1bc6bcc3 Force status bar window to be visible when expanded
Also don't collapse status bar if low profile gets set.
Status bar should almost never be collapsed without explicit
user action, and this only leads to issues.

Fixes: 27629489
Change-Id: Ibe5c64df578438c7224985b173a9cd967bf363bf
2016-05-11 15:38:15 +00:00
Jason Monk
ce4edb9234 Merge "Add metrics constant for new settings activity" into nyc-dev
am: 8b3cb1b2ff

* commit '8b3cb1b2ffa3154743e0228658b295ddd212bc68':
  Add metrics constant for new settings activity

Change-Id: I72e46018117f5fc27faa72cbc98c44ed8648e2f8
2016-05-11 15:32:40 +00:00
Jason Monk
8b3cb1b2ff Merge "Add metrics constant for new settings activity" into nyc-dev 2016-05-11 15:27:38 +00:00
Julia Reynolds
eae43fbd17 Do not bundle cross user.
Bug: 28665081
Change-Id: I026b8a3a731183f96b45c19b95b4a0d109677a4c
2016-05-11 10:59:53 -04:00
Torne (Richard Coles)
d3831179c8 Change webview developer setting string.
Request from UI to change string to make it clearer.

Bug: 28691051
Change-Id: Ibc2507a0e278994741c43fdadccbbe3e416b2e49
2016-05-11 15:52:07 +01:00
Victor Chang
d1e06f3d03 Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev
am: 090b5a8e8c

* commit '090b5a8e8c6cbe069c9818eda25b1976da6426a9':
  Fix ConfirmCredential is not presented before trusting cert installed by PO/DO

Change-Id: Ia5afd41dcadc0b43c92061eefa111c168857ef32
2016-05-11 14:47:20 +00:00
Victor Chang
090b5a8e8c Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 2016-05-11 14:43:15 +00:00
Todd Kennedy
fc7701c569 Merge "Fix secondary ABI instrumetion" into nyc-dev
am: f09f069936

* commit 'f09f0699369c02a6a46fbff68c02b00a7c703697':
  Fix secondary ABI instrumetion

Change-Id: I7a48511c8038725524abd8fc0adbd86e9e9fe09c
2016-05-11 14:41:44 +00:00
Todd Kennedy
f09f069936 Merge "Fix secondary ABI instrumetion" into nyc-dev 2016-05-11 14:35:19 +00:00
Jason Monk
259e038858 Add constants for settings pages
am: 25118d1aa2

* commit '25118d1aa2274d258c183187b90963a11840b0f3':
  Add constants for settings pages

Change-Id: I189f7640ff94f19ae6de824b6d01dea9fb546231
2016-05-11 14:09:32 +00:00
Jason Monk
a1f697f537 Add metrics constant for new settings activity
Bug: 28554048
Change-Id: I3e2008890779867ecbc5fe485f33d52d75f0b324
2016-05-11 09:58:48 -04:00
Jason Monk
25118d1aa2 Add constants for settings pages
Some settings pages weren't extending SettingsPreferenceFragment
and they need to.

Bug: 28634520
Change-Id: Iebb63027b6390974eb2070b3388763d49e9529e6
2016-05-11 09:56:49 -04:00
Joachim Sauer
564318a78d Merge "Fix AbstractStringBuilder gaining extra APIs." am: b64859d899
am: 9df8eeb567

* commit '9df8eeb567f7a0eed59f53cc7d23b904972c31f6':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: Ia0836beedfeebc3ba208eb6a4d50527bbdd1e601
2016-05-11 13:53:53 +00:00
Joachim Sauer
9df8eeb567 Merge "Fix AbstractStringBuilder gaining extra APIs."
am: b64859d899

* commit 'b64859d89999c1e87ae3980192a4987ba4baa002':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I392e2dde81254d38abd48e2027d94ec960560ed5
2016-05-11 13:51:06 +00:00
Joachim Sauer
b64859d899 Merge "Fix AbstractStringBuilder gaining extra APIs." 2016-05-11 13:47:09 +00:00
Jason Monk
a029a1a5ab Merge "Make collapsed QS work the same as expanded" into nyc-dev
am: 0934240233

* commit '09342402332826b46cf8181196a8793202104e31':
  Make collapsed QS work the same as expanded

Change-Id: I5b9e4f642482567a2340319707f9118aa2f3511b
2016-05-11 13:45:51 +00:00
Jason Monk
0934240233 Merge "Make collapsed QS work the same as expanded" into nyc-dev 2016-05-11 13:37:18 +00:00
Joachim Sauer
a305ee1027 Fix AbstractStringBuilder gaining extra APIs.
AbstractStringBuilder showed up in the API as gaining methods originally
belonging to StringBuffer/StringBuilder (mostly append(*) and
insert(*)).

Ideally it should not be in the API at all, but it's traditionally been
there and we'll keep it for now.

@hide the affected methods and move the "implements Appendable"
definition to StringBuffer/StringBuilder (as methods implementing an
interface can't be @hidden).

(cherry picked from commit 91f4aec3cc)

Bug: 27582395
Change-Id: I0b85c2c84f3e52ffe7864728d083f9c6ea7304ef
2016-05-11 14:19:44 +01:00
Donghyun Cho
c21f63aa95 CEC: Update system audio mode based on the current status of AVR
When AVR is newly discovered, make TV get the current status of AVR
first. Based on the response, TV will update and initiate system audio
mode if necessary.

Bug: 27858658, Bug: 27168826
Change-Id: I3084471db970d271693f10dae802d8abaccddf39
2016-05-11 13:15:38 +00:00
Julia Reynolds
da01ac82e2 Swap radio button alphas.
Change-Id: I9fb4ff64a3e92659c614cfff3f23e2ba8fa3b2cd
Fixes: 27597108
2016-05-11 08:54:19 -04:00
Narayan Kamath
b8106947d5 Merge "Log optimizing apps dialog time in seconds (and not decis)." into nyc-dev
am: 7fa5016977

* commit '7fa5016977edd5eb3dea154b76c4767de546fcb1':
  Log optimizing apps dialog time in seconds (and not decis).

Change-Id: Ia86b8cb0f38d5dd60d72cc223a658d2cd393477a
2016-05-11 12:45:20 +00:00
Greg Kaiser
9311165c2c Merge "GradientColor: Fix typo in documentation." into nyc-dev
am: a452dd3fd9

* commit 'a452dd3fd97fc1cae971abad5bfcb40013dad0c6':
  GradientColor: Fix typo in documentation.

Change-Id: I392ac824d733dcbeb2e79d5be4ad1668ad3400cc
2016-05-11 12:39:38 +00:00
TreeHugger Robot
7fa5016977 Merge "Log optimizing apps dialog time in seconds (and not decis)." into nyc-dev 2016-05-11 12:38:31 +00:00
Greg Kaiser
a452dd3fd9 Merge "GradientColor: Fix typo in documentation." into nyc-dev 2016-05-11 12:32:18 +00:00
Narayan Kamath
b3e435439c Log optimizing apps dialog time in seconds (and not decis).
bug: 28528058
bug: 28544474
Change-Id: Ib95d5625640c3c8d27d1844c49188570d7196ee2
2016-05-11 11:57:16 +01:00
Calin Juravle
6694dbef38 Do not clear profiles after OTAs
Bug: 28689868
Change-Id: I21b75eb6918915b16b0d1a06e753a56822834a2d
2016-05-11 10:53:00 +01:00
Joachim Sauer
6fcdca255a Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev
am: 5b40d70ced

* commit '5b40d70ced417f1f29f8ce36bed3ecfb26278486':
  Fix AbstractStringBuilder gaining extra APIs.

Change-Id: I46085f856170dd21069934ce9f7a1b8a991bc84d
2016-05-11 09:35:16 +00:00
Joachim Sauer
5b40d70ced Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev 2016-05-11 09:25:09 +00:00
Jakub Pawlowski
2168fc29a2 Fix GATT Characteristic write type serialization
Default writeType for GATT characteristic was not being
serialized into Parcel. This cause errors when trying to
write into Characteristic.

Bug: 27910548
Change-Id: Ib2f88cf991123eaea244f16fa36deb0d773c5a33
2016-05-11 06:53:10 +00:00
Donghyun Cho
639eb6ef30 Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev
am: f09fcff8d4

* commit 'f09fcff8d40b34171fe88c7ba228e1148ff942ac':
  CEC: Handle <Active Source> from AVR properly

Change-Id: Ib02ac3e1128709f88e642e618f60704c58e7de45
2016-05-11 06:26:35 +00:00
Donghyun Cho
f09fcff8d4 Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev 2016-05-11 06:20:09 +00:00
Kevin Hufnagle
4434744f13 docs: Updated Billing API documentation (for Project Nickel).
Added references to Project Nickel (rounded and "relevant" pricing
for each country where an Android app is published) within overview
and reference pages. Also added discussion of pricing templates and
the associated operations in the "administration" page.

Finally, completed minor touch-ups to billing administration section
(removed unhelpful links, updated screen captures).

Bug: 28204935
Change-Id: I917d06876d1525f24cb26a55a39cd64ae479b8f8
2016-05-10 22:41:41 -07:00
smain@google.com
0ffe2950a4 fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf am: 718d27d8dc am: 53b552d7f3
am: df9bf7da82

* commit 'df9bf7da82b829894eb3729bf291c74d857f56c3':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: I4d60f3b796c3c81a2b483d542a80db1e07427e41
2016-05-11 05:14:11 +00:00
smain@google.com
df9bf7da82 fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf am: 718d27d8dc
am: 53b552d7f3

* commit '53b552d7f3f7071019a3c84d58d1e3fccc642c71':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie72fb65bdff90844cec767250cb33bbfba72c9f7
2016-05-11 05:11:32 +00:00
smain@google.com
53b552d7f3 fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf
am: 718d27d8dc

* commit '718d27d8dcd94a8b86ceb6e63782c8265f101570':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: I0d6623892a7dc99a35a2ef4f2e1f9431ab111117
2016-05-11 05:08:30 +00:00
smain@google.com
718d27d8dc fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121
am: 0772f44acf

* commit '0772f44acfb710b9e587f543f9e4424c555c9083':
  fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie8bfb9a6fe9858300571669e1fc2efe58d55b848
2016-05-11 05:05:52 +00:00
smain@google.com
0772f44acf fix redirects,
as per linkchecker cl: https://critique.corp.google.com/#review/122012121

Change-Id: Ie0ff7349f5018913d63bf8c169dd4eacc7faca64
2016-05-10 21:58:52 -07:00
smain@google.com
90961ba21e new downloads and notes for studio 2.1.1 security update am: 77f368fed9 -s ours am: 58b25d39a5 am: 2558617210 am: 3b3b5f8f31
am: e4a239313b

* commit 'e4a239313b0e18da0cef4baadb6338f0fc226e54':
  new downloads and notes for studio 2.1.1 security update

Change-Id: I4cb5ed2ff2a0b195d014775efb825f5117c74a97
2016-05-11 03:22:03 +00:00
smain@google.com
e4a239313b new downloads and notes for studio 2.1.1 security update am: 77f368fed9 -s ours am: 58b25d39a5 am: 2558617210
am: 3b3b5f8f31

* commit '3b3b5f8f31693e08a5f3bcf9a24576b16be30245':
  new downloads and notes for studio 2.1.1 security update

Change-Id: Idb41c0fe61c4c09dd045db9c7fcf2ba05ec438e7
2016-05-11 03:18:57 +00:00
smain@google.com
3b3b5f8f31 new downloads and notes for studio 2.1.1 security update am: 77f368fed9 -s ours am: 58b25d39a5
am: 2558617210

* commit '25586172107ca82f212e685c505e9f1a536ffa13':
  new downloads and notes for studio 2.1.1 security update

Change-Id: I7c0a70735fa144052c57817b0d91745ac92c5251
2016-05-11 03:16:20 +00:00
smain@google.com
2558617210 new downloads and notes for studio 2.1.1 security update am: 77f368fed9 -s ours
am: 58b25d39a5

* commit '58b25d39a5d778ff666fb0a9d9838a66dc071c9c':
  new downloads and notes for studio 2.1.1 security update

Change-Id: If13f2134f06733cb4707cac29d8489e1b76095df
2016-05-11 03:13:43 +00:00
smain@google.com
58b25d39a5 new downloads and notes for studio 2.1.1 security update
am: 77f368fed9  -s ours

* commit '77f368fed9457c93778f7b155d883751c553a7fa':
  new downloads and notes for studio 2.1.1 security update

Change-Id: Ic44876292fe62f872f2a8c165610e227c3b2453f
2016-05-11 03:11:28 +00:00
Joe Fernandez
ac3ca3ae5d docs: DoDS Wear reference docs (regenerated) am: 95df02229c am: bc2c9b6d4c am: 6bbab0d7e8
am: 391cb4f7ce

* commit '391cb4f7ce41d3c05f6313ac486320d9890a7a7c':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: I1c6bdb00ff659c83e6a19b5f9f9d4346ffec9f6e
2016-05-11 02:48:21 +00:00
Joe Fernandez
391cb4f7ce docs: DoDS Wear reference docs (regenerated) am: 95df02229c am: bc2c9b6d4c
am: 6bbab0d7e8

* commit '6bbab0d7e8f200be4f4f58c3cdfe433c75aaf48d':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: I45c17dc1369004a243e8be0738798ae362fe4932
2016-05-11 02:45:44 +00:00
Joe Fernandez
6bbab0d7e8 docs: DoDS Wear reference docs (regenerated) am: 95df02229c
am: bc2c9b6d4c

* commit 'bc2c9b6d4c271b7d9bd4c5ec43246e5d9a142a56':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: I40a099f31d71cd4c7dc30d91297a41d77d69d6eb
2016-05-11 02:42:40 +00:00
Joe Fernandez
bc2c9b6d4c docs: DoDS Wear reference docs (regenerated)
am: 95df02229c

* commit '95df02229cd96d2bdb6c3966f0957e9faaeb72ad':
  docs: DoDS Wear reference docs (regenerated)

Change-Id: Iad7c032b5557ba856c8b59d6e492a03034804b18
2016-05-11 02:40:01 +00:00
Donghyun Cho
455f09d818 CEC: Handle <Active Source> from AVR properly
To avoid timing issues, handling of <Active Source> was delayed until
corresponding tv input becomes ready. However, AVR is not considered as
a tv input, so delayed <Active Source> will not be processed. This
change makes <Active Source> from AVR handled immediately rather than
buffered.

Bug: 25630805
Change-Id: Iae8e86a84b5a9e5a2e62e457aaf93da67f145fac
2016-05-11 11:25:30 +09:00
Wale Ogunwale
e6cb450b0d Crop wallpaper windows to their current target stack bounds
Crop wallpaper windows to the stack bounds of their current target to avoid
them showing behind transparent windows in other stacks in split-screen mode.

Bug: 27989717
Change-Id: Iff7cec201dd8061026e32af0f44380862fc37705
2016-05-10 19:18:32 -07:00
Joe Fernandez
95df02229c docs: DoDS Wear reference docs (regenerated)
b/28462526

Change-Id: I59874b401aafb76f965a9dc734db73abf68a1250
2016-05-10 19:12:36 -07:00