Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe LaPenna
619d484912 Merge "Do not show error dialogs on watch builds." into nyc-mr1-dev 
am: 50beaa02f8

* commit '50beaa02f89826cfca84273a7e8140b5e6f6a234':
  Do not show error dialogs on watch builds.

Change-Id: Idd0151447b7fb42deadc5d4d1e416ef8e372c2e7
 2016-05-14 00:11:39 +00:00
smain@google.com
98f6970086 Revisions to develop landing page for studio 2.1 
Change-Id: I8fe5e0dc1f9627306a2516f795ed5933d5bb671a
 2016-05-13 17:10:32 -07:00
TreeHugger Robot
50beaa02f8 Merge "Do not show error dialogs on watch builds." into nyc-mr1-dev 2016-05-14 00:05:48 +00:00
Android Build Merger (Role)
e981d7700e Merge "Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 am: 7ea2b0937e am: a4b10af96c" into nyc-mr1-dev-plus-aosp 2016-05-14 00:01:43 +00:00
Daniel Nishi
ac62b4b360 Add an Activity action to go into the Deletion Helper. 
Applications may want to jump to the Deletion Helper to free up
storage when the device is under storage pressure.

Bug: 28675265
Change-Id: I709c39f3e699ab5f51f4ad1272468583276ff050
 2016-05-14 00:01:33 +00:00
Sreevani Sreejith
5e452210c8 Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 am: 7ea2b0937e 
am: a4b10af96c

* commit 'a4b10af96c98f99e028066767697c30ac166c92f':

Change-Id: I2867cef37136371a92f271986024e0292f5ffb98
 2016-05-14 00:01:19 +00:00
Android Build Merger (Role)
7c0be535c3 Merge "Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 am: 7ea2b0937e am: a4b10af96c" into nyc-mr1-dev-plus-aosp 2016-05-13 23:59:36 +00:00
Sreevani Sreejith
e796854981 Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 am: 7ea2b0937e 
am: a4b10af96c

* commit 'a4b10af96c98f99e028066767697c30ac166c92f':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: Ic739c4274d69563dc3cc96d52b164c5002f03df2
 2016-05-13 23:59:10 +00:00
Sreevani Sreejith
7612c9862d Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 am: 7ea2b0937e 
am: 2db406064d

* commit '2db406064d1c945ec3eae7d98aae828a7fdfb3f2':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: Ic3ad42d3bba83195761fa7917069c3e7e79d8a9a
 2016-05-13 23:59:06 +00:00
Shubang
2263fb0b1a TIF: Update TvInputInfo when the input is reinstalled. 
Bug: 28678019
Change-Id: Ibd290245a64cdb4950bda4c054e713b38a546f5f
 2016-05-13 23:57:38 +00:00
sreevanis
2db406064d Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 
am: 7ea2b0937e

* commit '7ea2b0937ea4c637e95db89f3cecd6eacf095c5b':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: I832994092e474642ec0a0d42eb47f1f5c0aed5e6
 2016-05-13 23:56:35 +00:00
sreevanis
a4b10af96c Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 am: a87dfa0de6 
am: 7ea2b0937e

* commit '7ea2b0937ea4c637e95db89f3cecd6eacf095c5b':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: I4f6c414af02248160912e6593fc442c9f2aa5075
 2016-05-13 23:56:33 +00:00
Sreevani Sreejith
7ea2b0937e Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am: f4bf6f7675 
am: a87dfa0de6

* commit 'a87dfa0de6cdad7e42b8d21fd1112df2f04b36df':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: I3a5965b18d7a6771593a4d8a4c863d1f38e445c0
 2016-05-13 23:54:00 +00:00
sreevanis
a87dfa0de6 Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs 
am: f4bf6f7675

* commit 'f4bf6f7675bc04f3f9e4cb05408b5c63ae8d3c49':
  Added Support and Release Notes Nav link and IMF Nav link.

Change-Id: I58ed03df80f0db496cbb45b5a7a630b9ba878454
 2016-05-13 23:51:24 +00:00
Sreevani Sreejith
f4bf6f7675 Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs 2016-05-13 23:47:48 +00:00
sreevanis
6fb95bcaf1 Added Support and Release Notes Nav link and IMF Nav link. 
Bug:28768632
Change-Id: I553001c8876ae498472dd64e0948876ba5ca7d2c
 2016-05-13 16:41:51 -07:00
Android Build Merger (Role)
c427033f25 Merge "Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev am: 7dedfd0c04 am: 39e180173b" into nyc-mr1-dev-plus-aosp 2016-05-13 23:35:49 +00:00
Android Build Merger (Role)
46c16cbb58 Merge "Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev am: 9386a40edf am: f05f331453" into nyc-mr1-dev-plus-aosp 2016-05-13 23:35:37 +00:00
Dianne Hackborn
32103e106f Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev am: 7dedfd0c04 
am: 39e180173b

* commit '39e180173beb7cdfceeac8c204d3068a747dcc5c':

Change-Id: I1a9b62bc5a4010b15e6696a35732bd6a89c032f4
 2016-05-13 23:35:10 +00:00
Chong Zhang
2e9b0f9e1c Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev am: 9386a40edf 
am: f05f331453

* commit 'f05f331453cd5f95db00c408b1dd4598340929b8':

Change-Id: I167d271f06ffa37edb84c40b10bdab5dc34c5324
 2016-05-13 23:35:06 +00:00
Jae Seo
7ac2689239 Fix regression from "PIP: Fix NPE when onboarding is shown" 
Removed the second "continue" to allow isFirstValidTask to be set to
false.
This is a follow-up fix from commit 91c5066c00.

Bug: 28754669
Change-Id: Ic852afaa78fc79bcd85b04e888975cd3bfc72094
 2016-05-13 16:33:43 -07:00
Android Build Merger (Role)
77b3d2bd8e Merge "Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev am: 7dedfd0c04 am: 39e180173b" into nyc-mr1-dev-plus-aosp 2016-05-13 23:32:46 +00:00
Android Build Merger (Role)
cdfc196cd3 Merge "Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev am: 9386a40edf am: f05f331453" into nyc-mr1-dev-plus-aosp 2016-05-13 23:32:35 +00:00
Dianne Hackborn
c89bf2bc5b Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev am: 7dedfd0c04 
am: 7f80882820

* commit '7f8088282094d1eeb0232952d18f02d1331c6fe4':
  Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...

Change-Id: I70abd9f33039c7cfc74c872eca6fd97b1c2557bb
 2016-05-13 23:31:58 +00:00
Dianne Hackborn
ebd58bfb34 Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev am: 7dedfd0c04 
am: 39e180173b

* commit '39e180173beb7cdfceeac8c204d3068a747dcc5c':
  Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...

Change-Id: Ic0d78a3e6deb55c53a9b199c62c94dcb617db75d
 2016-05-13 23:31:55 +00:00
Chong Zhang
deb40094ab Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev am: 9386a40edf 
am: 367d298c4f

* commit '367d298c4f89c5ae33cdffe38604c799e2713ac8':
  Set final crop on wallpaper instead of intersect clip with stack bounds

Change-Id: I1362c2d848389d61fb9a4cab0d1f4cf1b1ddae06
 2016-05-13 23:31:54 +00:00
Chong Zhang
3058cc3c18 Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev am: 9386a40edf 
am: f05f331453

* commit 'f05f331453cd5f95db00c408b1dd4598340929b8':
  Set final crop on wallpaper instead of intersect clip with stack bounds

Change-Id: I80a9c9de24b24876ee32a1031d3ece72bb51a356
 2016-05-13 23:31:51 +00:00
Dianne Hackborn
39e180173b Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev 
am: 7dedfd0c04

* commit '7dedfd0c0486bb7d8b12b767e026bfdb2267f8e7':
  Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...

Change-Id: I4a6004f677dde31fe3d77f596f59ea30a49d5c0f
 2016-05-13 23:29:08 +00:00
Dianne Hackborn
7f80882820 Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev 
am: 7dedfd0c04

* commit '7dedfd0c0486bb7d8b12b767e026bfdb2267f8e7':
  Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy...

Change-Id: I8bf52b74090068eddbc0190a12a8f42013b3f048
 2016-05-13 23:29:06 +00:00
Chong Zhang
f05f331453 Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev 
am: 9386a40edf

* commit '9386a40edf153f31e96283bf61a5b2feac96ec8f':
  Set final crop on wallpaper instead of intersect clip with stack bounds

Change-Id: I14badc69395be338f6364aab087dc5f3272e9e3b
 2016-05-13 23:29:04 +00:00
Chong Zhang
367d298c4f Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev 
am: 9386a40edf

* commit '9386a40edf153f31e96283bf61a5b2feac96ec8f':
  Set final crop on wallpaper instead of intersect clip with stack bounds

Change-Id: Ic4790a2a66f9f01064dbcbf6c3f06ca6238f6c3f
 2016-05-13 23:29:03 +00:00
Android Build Merger (Role)
d20b7696fe Merge "Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8 am: cc758f9560" into nyc-mr1-dev-plus-aosp 2016-05-13 23:28:56 +00:00
Jorim Jaggi
c94faeafd4 Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8 
am: cc758f9560

* commit 'cc758f95606cf547f14039555b276cd43a9e3358':

Change-Id: Ifc6f291a8b0d2d03e5a09de13f6b44972f1e5a9a
 2016-05-13 23:28:33 +00:00
Android Build Merger (Role)
2ad99e9711 Merge "Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8 am: cc758f9560" into nyc-mr1-dev-plus-aosp 2016-05-13 23:26:56 +00:00
Jorim Jaggi
d9558cbfcf Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8 
am: 3e96d18285

* commit '3e96d18285ae64dc66d256cd8bafa8f1d0bcdebe':
  Also freeze configuration when freezing bounds

Change-Id: I55ea86df1528e4f605a2bd37c4e8fece920bf665
 2016-05-13 23:26:29 +00:00
Jorim Jaggi
a45d8293f0 Merge "Also freeze configuration when freezing bounds" into nyc-dev am: 7f303bced8 
am: cc758f9560

* commit 'cc758f95606cf547f14039555b276cd43a9e3358':
  Also freeze configuration when freezing bounds

Change-Id: I32197d2ce61a67c605d1df9b2361e7c0b3a6e22c
 2016-05-13 23:26:29 +00:00
Jorim Jaggi
3e96d18285 Merge "Also freeze configuration when freezing bounds" into nyc-dev 
am: 7f303bced8

* commit '7f303bced8b7c1fe7f8e7f93de07106c5c610503':
  Also freeze configuration when freezing bounds

Change-Id: I95ccf9a1ca28d0f90c3fc17bc604e2cc667787d3
 2016-05-13 23:23:42 +00:00
Jorim Jaggi
cc758f9560 Merge "Also freeze configuration when freezing bounds" into nyc-dev 
am: 7f303bced8

* commit '7f303bced8b7c1fe7f8e7f93de07106c5c610503':
  Also freeze configuration when freezing bounds

Change-Id: I07f8742b38bea83a7a6e177c5a70bf81608da560
 2016-05-13 23:23:33 +00:00
Sreevani Sreejith
62af4b660e Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9 am: a9486c041f am: c1fdf55118 
am: ba28a11118

* commit 'ba28a1111820a59fb8812c0a0e6d35daf5bd4c9e':

Change-Id: Iad73ff5165ec298de696540e99e6ba728c7bcd19
 2016-05-13 23:23:18 +00:00
Chris Craik
0bcc022d8e Merge "Fix Skia filter behavior test" into nyc-dev am: 0c5bd7dffe 
am: 0cf377c6ae

* commit '0cf377c6ae8877af10b4ccdf508a2d84da31fd26':

Change-Id: If424c47138e8dbb53331e7c52391e80485cd29d5
 2016-05-13 23:23:14 +00:00
Dianne Hackborn
7dedfd0c04 Merge "Fix issue #28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev 2016-05-13 23:22:12 +00:00
Chong Zhang
9386a40edf Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev 2016-05-13 23:21:04 +00:00
Sreevani Sreejith
c1cea9fcc0 Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9 am: a9486c041f am: c1fdf55118 
am: 71a517447c

* commit '71a517447c308280bfc5cac707683ba0b3aafa45':
  Wear 2.0 preview  input method documentaation.

Change-Id: I74a2882d221e88dcee27973e74c7f803c85c4013
 2016-05-13 23:20:18 +00:00
Chris Craik
ec51ed4aa7 Merge "Fix Skia filter behavior test" into nyc-dev am: 0c5bd7dffe 
am: de6400a282

* commit 'de6400a2824b4396e971fc5105f6dc29b97cebc7':
  Fix Skia filter behavior test

Change-Id: Ia19db77125a90b546e9766e070917f562c08d49e
 2016-05-13 23:20:13 +00:00
sreevanis
ba28a11118 Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9 am: a9486c041f 
am: c1fdf55118

* commit 'c1fdf55118da3f0630ce4343f9f95f8f79fa2091':
  Wear 2.0 preview  input method documentaation.

Change-Id: I13ce360c2609201ba648153579d74fbab3e2233e
 2016-05-13 23:17:39 +00:00
sreevanis
71a517447c Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9 am: a9486c041f 
am: c1fdf55118

* commit 'c1fdf55118da3f0630ce4343f9f95f8f79fa2091':
  Wear 2.0 preview  input method documentaation.

Change-Id: I3d72e12ff4e1ea0d7cd705269c3692fe1d5d4ef3
 2016-05-13 23:17:35 +00:00
Chris Craik
0cf377c6ae Merge "Fix Skia filter behavior test" into nyc-dev 
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: I505e0cf42d47afed31dda7dfcae8a890f17f2dff
 2016-05-13 23:17:34 +00:00
Chris Craik
de6400a282 Merge "Fix Skia filter behavior test" into nyc-dev 
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: Ifff29ff78c32bf2af43ffaa2b8c922b3a41fa195
 2016-05-13 23:17:33 +00:00
Jorim Jaggi
7f303bced8 Merge "Also freeze configuration when freezing bounds" into nyc-dev 2016-05-13 23:16:13 +00:00
Sreevani Sreejith
c1fdf55118 Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am: 9c105c50a9 
am: a9486c041f

* commit 'a9486c041f177f11d5f61dc7fb92a10447c836a3':
  Wear 2.0 preview  input method documentaation.

Change-Id: Ideb177a06ba57134e535dcd67a8c01ca9bb8216d
 2016-05-13 23:14:59 +00:00