Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
bf56921d35 Merge "Docs: CL for continuing work on tactically merged N-DP3 docs." into mnc-io-docs 2016-05-17 03:17:41 +00:00
David Friedman
182e8b53ea Docs: CL for continuing work on tactically merged N-DP3 docs. 
This CL continues the work from ag/1036623 and ag/1036124.

Change-Id: Ic1e026ed9f53a389a0435c2b8e21edfe9ef635c4
 2016-05-16 19:39:08 -07:00
Kevin Hufnagle
5deb0d6dfe cherrypick from mnc-io-docs docs: Updated Billing API documentation 
(for Project Nickel).

This CL is a continuation of CL 1026559.

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: Id194c17b5dd23fc89b9b69cf90e601993a66d014
Original-Change-Id: I917d06876d1525f24cb26a55a39cd64ae479b8f8
 2016-05-16 18:48:53 -07:00
Chong Zhang
cc3eccf578 Apply final crop during surface preservation 
Apply stack crop to the preserved surface so that it doesn't stick over
the dock divider.

bug: 28567495
Change-Id: Ib7a9d8ec82a7752ecbef60a86f441e35e16ac877
 2016-05-16 18:25:45 -07:00
smain@google.com
28445c4d7d invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). 
bug: 28801246

Change-Id: I1c1dbfc20ec4bdd16ede76d4cbad6474bafafb55
 2016-05-16 18:22:06 -07:00
Chris Tate
f518b2a835 Merge "Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: d4056a279d" into nyc-mr1-dev-plus-aosp 
am: 373cbac7ad

* commit '373cbac7ad0b0040cf52930bf8177cfe6c343fa0':

Change-Id: Iaad6f95b1861dcb0c50bcd74ba06e7b8383ee48d
 2016-05-17 01:14:40 +00:00
Christopher Tate
4800712482 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: b7ae368079 
am: c4999be6e3

* commit 'c4999be6e34297f595c87cbe4c274e2bc8c1665a':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I8827677fe788f055fcb8c677915219ab179fa4be
 2016-05-17 01:14:33 +00:00
Android Build Merger (Role)
373cbac7ad Merge "Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 am: d4056a279d" into nyc-mr1-dev-plus-aosp 2016-05-17 01:11:01 +00:00
Wale Ogunwale
6a95cf77ff Merge "Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 273d6e8f56" into nyc-mr1-dev-plus-aosp 
am: 96a71d86f0

* commit '96a71d86f0818a308f2bf33afb6af8bfe18e3c15':

Change-Id: I74056173921d10c40b1232010d4e2759040822a0
 2016-05-17 01:10:50 +00:00
Wale Ogunwale
fde6b69095 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 33cffe3717 
am: f5a87d86bf

* commit 'f5a87d86bf08b564d2db00bf626092721e348e61':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: Ie5cf7842a219fedd849bc161899df113f383c944
 2016-05-17 01:10:44 +00:00
Chris Tate
d0e6a0e3dd Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 
am: d4056a279d

* commit 'd4056a279d34900b396229c79d591d1ed8bf1ea1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Iaf3ffcfa8ece43eca0118bb3c03fc380417af001
 2016-05-17 01:10:39 +00:00
Chris Tate
c4999be6e3 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev am: 11d9586117 
am: b7ae368079

* commit 'b7ae3680798aa5dce807015a763a0d017ce7e0c1':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: Idcc14b5f890497a6bf59755d91f66c27f5db3451
 2016-05-17 01:09:35 +00:00
Jim Miller
4db942c21b Don't always announce accessibility events when resetting password 
The code use to always announce for accessibility when resetting the
password field, which results in announcing "Four characters replaced
with zero characters."

The fix is to only announce this message when the user needs to try
again.

Fixes bug 24331841

Change-Id: Icc9450d37b9338a39709f50666829d4a007b2b65
 2016-05-16 18:06:50 -07:00
Android Build Merger (Role)
96a71d86f0 Merge "Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 273d6e8f56" into nyc-mr1-dev-plus-aosp 2016-05-17 01:05:55 +00:00
Wale Ogunwale
d79cb3bd10 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 273d6e8f56

* commit '273d6e8f565fbb2b9bac9c81764242a39e431cfd':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I32680230f109355f13873775c1112359e010d45a
 2016-05-17 01:05:30 +00:00
Christopher Tate
b7ae368079 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I5987e96ea1d2668037a7f924ad3ee6b5fa96bda8
 2016-05-17 01:05:23 +00:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
 2016-05-17 01:05:00 +00:00
Christopher Tate
d4056a279d Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 
am: 11d9586117

* commit '11d9586117e983e36b2467bcb436200268cd0933':
  Sysconfig define a whitelist of permitted backup transports

Change-Id: I7c894dd6dc494dc5c02ba9e9676b53b0acc281d4
 2016-05-17 01:03:59 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
 2016-05-17 00:59:36 +00:00
Amith Yamasani
fec1acb7b4 Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 52ccdf05d7" into nyc-mr1-dev-plus-aosp 
am: 77ccfc8fe9

* commit '77ccfc8fe9df574b79543fc3dfbcf2367403714e':

Change-Id: Ic9bf1ac6f597cc30dd4cbbd8115b92884c20316a
 2016-05-17 00:58:43 +00:00
Wale Ogunwale
19fd124062 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev am: fc932b9d69 am: 245d5580aa 
am: b431f58574

* commit 'b431f58574679254144aef0dcd0c4e21be8fd395':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I079a1f502e8001999fc99cd67628d6f62b13ac08
 2016-05-17 00:58:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
 2016-05-17 00:57:25 +00:00
Chris Tate
11d9586117 Merge "Sysconfig define a whitelist of permitted backup transports" into nyc-dev 2016-05-17 00:56:49 +00:00
Amith Yamasani
70db3c2a31 Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 9db4384118" into nyc-mr1-dev-plus-aosp 
am: c4ac937dab

* commit 'c4ac937dab0ca67364db543a71c216f09c078852':

Change-Id: I96ceb3e96723cfd239bcd0f9548038e4ba987062
 2016-05-17 00:52:08 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Amith Yamasani
43748bc9a8 Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 0250ae2c1b 
am: 77069b959b

* commit '77069b959b44bceb0eef44ca2e850765ef1f81ae':
  Allow Shell to change component enabled state

Change-Id: Id16ceadd2843b943ad6d38a0334b97589c60d2b2
 2016-05-17 00:50:03 +00:00
Android Build Merger (Role)
77ccfc8fe9 Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 52ccdf05d7" into nyc-mr1-dev-plus-aosp 2016-05-17 00:48:20 +00:00
Amith Yamasani
8c5bba9107 Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 52ccdf05d7

* commit '52ccdf05d702d4e34a08b67d3edc0c17b5178117':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I28c3e69c102eb3669cf31774e73a90841dc449d4
 2016-05-17 00:47:49 +00:00
Wale Ogunwale
b431f58574 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev am: fc932b9d69 
am: 245d5580aa

* commit '245d5580aa014d9ae93b26c295f8c6b751f501a8':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5848341577b9695d884f49db4b37b5a18bcbe7be
 2016-05-17 00:47:40 +00:00
Android Build Merger (Role)
c4ac937dab Merge "Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe am: 9db4384118" into nyc-mr1-dev-plus-aosp 2016-05-17 00:44:51 +00:00
Amith Yamasani
77069b959b Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 0250ae2c1b

* commit '0250ae2c1b1b3b75a9b1f3c995be031efef50bcf':
  Allow Shell to change component enabled state

Change-Id: I2a29c8e15ba81a9aa5c3950c8aeccd3d4ff662cc
 2016-05-17 00:42:43 +00:00
Amith Yamasani
c562b7886e Merge "Allow Shell to change component enabled state" into nyc-dev am: 19b34eccfe 
am: 9db4384118

* commit '9db4384118911abd55ee528e570707be2af3f85b':
  Allow Shell to change component enabled state

Change-Id: I9a309ea4fb46925de793b339896629ca43cb053f
 2016-05-17 00:42:43 +00:00
Wei Jia
838a4ed101 android_media_MediaSync: Do not pass NULL to AString ctor. 
Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
 2016-05-16 17:40:02 -07:00
Wale Ogunwale
245d5580aa Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I2211b2a8eb03a692bdbc6124f0103340c39c4adc
 2016-05-17 00:38:50 +00:00
Wale Ogunwale
52ccdf05d7 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 
am: fc932b9d69

* commit 'fc932b9d699e5797fbbfac3ec09a789419ade269':
  Update configuration of all visible activities in a stack when resizing

Change-Id: I5f121bb48513d054f53d17bd7a1030adb59d2a2e
 2016-05-17 00:37:47 +00:00
Amith Yamasani
9db4384118 Merge "Allow Shell to change component enabled state" into nyc-dev 
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I964e0aebb669adf368524454e2ca681784e8e67b
 2016-05-17 00:34:30 +00:00
Amith Yamasani
0250ae2c1b Merge "Allow Shell to change component enabled state" into nyc-dev 
am: 19b34eccfe

* commit '19b34eccfee9d14e6888c4813cc369bd4b3a7e81':
  Allow Shell to change component enabled state

Change-Id: I8b472bf3149b1e721ea90a8a6fed12549e3f1510
 2016-05-17 00:34:16 +00:00
TreeHugger Robot
fc932b9d69 Merge "Update configuration of all visible activities in a stack when resizing" into nyc-dev 2016-05-17 00:29:04 +00:00
Amith Yamasani
19b34eccfe Merge "Allow Shell to change component enabled state" into nyc-dev 2016-05-17 00:27:55 +00:00
Sunny Goyal
6d1b41d477 Maintaining diff for all widget operations instead of just the Views update 
When the widget starts lisnening again, it receives all the pending updates
until that point (restricted to the requested widgetIds). When startListening
is called for the first time, the widgetIds is empty and it does not get
any updated. Further calls to startlisting will give the missed updates
for the bound widgets

Bug: 23892701
Change-Id: I3aa06d3e33a0861c19cfd5ced567d5bb3b93d906
 2016-05-16 17:23:00 -07:00
Chris Craik
1182da1e63 Merge "Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: fa3e66e0ae" into nyc-mr1-dev-plus-aosp 
am: cde1df9222

* commit 'cde1df9222f633c88b815855d7a0836051ccab06':

Change-Id: I1146b6d03e4db204f96e7ca6e93a2cd187ce2f4f
 2016-05-17 00:17:47 +00:00
Chris Craik
f6856b0f34 Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: bd2edfca03 
am: f075b05d5a

* commit 'f075b05d5a8516ff98d9c25c1b5ac307fdfc234a':
  Fix hw layer overdraw/update visualization

Change-Id: I70968a90dbc3ea13654b7dbb8065d5a577a0f9ae
 2016-05-17 00:17:42 +00:00
Android Build Merger (Role)
cde1df9222 Merge "Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 am: fa3e66e0ae" into nyc-mr1-dev-plus-aosp 2016-05-17 00:13:23 +00:00
Chris Craik
60309d64e2 Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 
am: fa3e66e0ae

* commit 'fa3e66e0aef5b4868a554fcebcaba502426cbe89':
  Fix hw layer overdraw/update visualization

Change-Id: Ib2f1a4d6f8584ce9c25da0c810622b5e11c1f921
 2016-05-17 00:13:01 +00:00
Chris Craik
f075b05d5a Merge "Fix hw layer overdraw/update visualization" into nyc-dev am: 189e3e5ec5 
am: bd2edfca03

* commit 'bd2edfca03bf09143a941c3859c4fbd3f8115aba':
  Fix hw layer overdraw/update visualization

Change-Id: I0ffbf7cd8d1495cd131a4b610a3210f38458610e
 2016-05-17 00:12:48 +00:00
Andrii Kulian
eb1d322d1c Clear mResizedWhileNotDragResizing flag after reporting 
Currently mResizedWhileNotDragResizing flag is not cleared after
reporting resize to client, which causes sending lots of resize
messages and relayouts on app side.
This CL introduces another flag to track reporting to app.

Bug: 28696195
Change-Id: Ib5b6ea3e5f499c96057182f4b20583734dea56c4
 2016-05-16 17:10:13 -07:00
Chris Craik
bd2edfca03 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: Ic4c49b25e0d1709d34974adb828c3ab4644415e5
 2016-05-17 00:08:14 +00:00
Chris Craik
fa3e66e0ae Merge "Fix hw layer overdraw/update visualization" into nyc-dev 
am: 189e3e5ec5

* commit '189e3e5ec5b698f1062fb98692fa75d3750148e0':
  Fix hw layer overdraw/update visualization

Change-Id: I4e788e8a83fa02881ca18d82dc2371d5bf43284c
 2016-05-17 00:07:54 +00:00
TreeHugger Robot
189e3e5ec5 Merge "Fix hw layer overdraw/update visualization" into nyc-dev 2016-05-16 23:58:28 +00:00
Jorim Jaggi
886a5b5ac1 Handle multi-window for inset hint am: 23bf5462f0 am: 4958217aa4 
am: 2c4eddbc4a

* commit '2c4eddbc4aacffa6eb4bf937198fd12c7182df38':

Change-Id: I826c93135dbbc309209c2f10dedfcbadc2f364b6
 2016-05-16 23:41:01 +00:00