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
Hemal Patel
95bc07fbcb Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 8d8718fc53 am: 6396bf5e28" into nyc-mr1-dev-plus-aosp 
am: 3f6f5de2fa

* commit '3f6f5de2fa98702ec9e1a9747d803be0edf39082':

Change-Id: I021904c9d0cdd58d8543f1d6037ff8fc093389bc
 2016-05-28 00:48:47 +00:00
Hemal Patel
a29b0cae6f Merge "Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: 2b9497069d am: ffc5ae0721" into nyc-mr1-dev-plus-aosp 
am: 5d2e916386

* commit '5d2e916386c8f4ad5428f7daaf6ba0c1a4974db7':

Change-Id: Ica3d3b4703ceeb0c1fc01413a7a49d638df06aa5
 2016-05-28 00:48:45 +00:00
Hemal Patel
6981415215 Merge "Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535 am: b19774bd32" into nyc-mr1-dev-plus-aosp 
am: 0292052c87

* commit '0292052c876ba6ba1f1388093104495ef8337dec':

Change-Id: I98070751b0a84908c18252d4304ad220b5952744
 2016-05-28 00:48:42 +00:00
Hang Yin
49b525c736 Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 am: a23ed40af7 
am: b8c227aeef

* commit 'b8c227aeefe1731c7b539b8cb71aaed5fc00f0cf':
  Code Patch for camera preview switch tests

Change-Id: I0f02547f9a37d7aec8e530079fe36ee83f8a07d5
 2016-05-28 00:48:39 +00:00
Doris Liu
a014f838d9 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev am: fceaa60e24 am: 8fc70289b5 
am: ea58b67592  -s ours

* commit 'ea58b67592637fe1e380adfcd0c80d269757c81f':
  Copy native tree's property when mutate vector drawable

Change-Id: I910dca001d74a8073dd13df794ce1e0c6c28e19c
 2016-05-28 00:48:37 +00:00
Jorim Jaggi
25f332ca19 Replace Log.wtf by Log.e 
Bug: 28949995
Change-Id: I2193511566124980860843da0a822621184218b1
 2016-05-27 17:47:14 -07:00
Adrian Roos
c6fbc635a0 Merge "Change app crash dialog strings" into nyc-dev am: a7d66aa6b8 am: ca89f7b69f 
am: f0b8f05a76

* commit 'f0b8f05a76292d1237e1e40943de37c51f50aa9e':
  Change app crash dialog strings

Change-Id: Ia8cd3a8a12679656d15d943d9f8039c01c4c95a3
 2016-05-28 00:33:03 +00:00
Adrian Roos
a67acab7fd Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 am: 20962d345a 
am: f9048f0d47

* commit 'f9048f0d47b1f8bd40e09226ccee84e690c5551a':
  Simplify crash dialog

Change-Id: I24e1c642946210177db22c7225d828f44c2c3fef
 2016-05-28 00:32:59 +00:00
Adrian Roos
f8bddb4840 Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78 
am: c67191508b

* commit 'c67191508bb0ab195696fedd3e173c9b37488084':
  Fix bad one-line MessagingStyle

Change-Id: I96b15a9c1121f8c9be257722380ded5235bd5a93
 2016-05-28 00:32:56 +00:00
Adrian Roos
5e5d174c81 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 2c69d1ecae am: 85e60d203e 
am: 5cdc958240

* commit '5cdc958240cb00faa2a06cf1dddfae394ef5623d':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I57cd14ea27720454d698ef9144a93f2bbaeba1fd
 2016-05-28 00:32:52 +00:00
Android Build Merger (Role)
c70f07c283 Merge "Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 8d8718fc53 am: 2e63ef3cac am: fc5427e983" 2016-05-28 00:28:12 +00:00
TreeHugger Robot
776935a763 Merge "Move Xerox recommendation plugin to service." 2016-05-28 00:28:08 +00:00
Hemal Patel
d6435a2c1d Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 8d8718fc53 am: 2e63ef3cac 
am: fc5427e983

* commit 'fc5427e983c135e0e2aa92a3c2a2ce018cad57eb':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: Iad9ed60e9a743414789e97ff7c32da50068b259a
 2016-05-28 00:26:53 +00:00
Hemal Patel
ac21b0f483 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 2b9497069d am: 6501ac3bf9 
am: a76824e029

* commit 'a76824e029cd73dcdbf4ee3f5a3144f4f34a9f4e':
  Docs: Removed note in "Platform Versions" section

Change-Id: I76feb7e26c8698682a1fb303468a77b23c6085f7
 2016-05-28 00:26:50 +00:00
Hemal Patel
7fc6546992 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: d63315e535 am: 3921ba2f61 
am: c84e814234

* commit 'c84e81423437a6b3fbf4b53a3f35c19f13a63338':
  Docs: Fixed the end-of-comment tag

Change-Id: I2f07a5705536cf78b8e3850ca38a9ffa78b22e58
 2016-05-28 00:26:47 +00:00
Michael Wright
61a70832e2 Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: 82a8c5f246 am: 7eb543ef2c 
am: 904639a8f0

* commit '904639a8f09600cfcc182334be9487707ac613c4':

Change-Id: Ic8f04027c624054971aa6385adcfbe5cb02c4358
 2016-05-28 00:26:45 +00:00
Bart Sears
b25340c49e Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev am: ffc8723d88 
am: 56e2b4a83e  -s ours

* commit '56e2b4a83e318c43976a3b9bf450edc7d173fb25':
  Revert "Finalize resource IDs for N."

Change-Id: I5a4acecc86b6f1a85cd0776b18921fa93d85c1bd
 2016-05-28 00:26:43 +00:00
Makoto Onuki
53da7b9ee3 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f 
am: 451afea589

* commit '451afea5892454be029910b18a73d27bf41ad5bd':
  ShortcutManager: Implement get-drawable APIs

Change-Id: I6f72f51bbfed601c3ab087921e8de9a64ad785ee
 2016-05-28 00:26:15 +00:00
Winson Chung
8b1f76a84a Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev am: 8a9100caae 
am: c58084447d

* commit 'c58084447db37dfd6ff18a13b50a42989945ff8b':

Change-Id: Ida0d6d6037d1355c11d6ccfb13910f9f056c08da
 2016-05-28 00:22:04 +00:00
Winson Chung
c19b0cc90b Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev am: 8a9100caae 
am: 0786743a94

* commit '0786743a94e67b9c505d49738325bae6c8cddf9a':
  Tweaking layout to make two-task stacks to closer match design.

Change-Id: I040c56f34972dffe6cfdd290f3e93da725137450
 2016-05-28 00:18:58 +00:00
Winson
c58084447d Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev 
am: 8a9100caae

* commit '8a9100caaea34cadcd19910f5667407a29016d03':
  Tweaking layout to make two-task stacks to closer match design.

Change-Id: I976d0516fe103dac7bf5cad6ae48c4d026ab7982
 2016-05-28 00:16:48 +00:00
Winson
0786743a94 Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev 
am: 8a9100caae

* commit '8a9100caaea34cadcd19910f5667407a29016d03':
  Tweaking layout to make two-task stacks to closer match design.

Change-Id: I3f8aaebee4c47911715dbaaac904c9b93b89dac1
 2016-05-28 00:13:14 +00:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence 
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
 2016-05-27 17:13:10 -07:00
Makoto Onuki
fcb523502b Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev 
am: 8c5578bcb0

* commit '8c5578bcb0de2b3701de1833392dd56445d5024d':
  Fix build breakage due to res-id changes

Change-Id: I48f34526be7f128189bea6dff49d5b9761f98385
 2016-05-28 00:09:27 +00:00
Winson Chung
8a9100caae Merge "Tweaking layout to make two-task stacks to closer match design." into nyc-dev 2016-05-28 00:07:47 +00:00
Chris Tate
f6befeee9b Merge "Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 am: 447e93dffc" into nyc-mr1-dev-plus-aosp 
am: 696bd0e388

* commit '696bd0e3884b0e3b9627789e094372a76246b3eb':

Change-Id: I42133e2cd4b120bae2c5783e5b4278be294bf43b
 2016-05-28 00:07:18 +00:00
Doris Liu
d89e9fd354 Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c 
am: cf9df710e5

* commit 'cf9df710e534ad04af4957f844993aa4c11fd706':

Change-Id: Ia6d08b74d4a77ec9e6e673282117f6eaee82fa50
 2016-05-28 00:06:12 +00:00
Christopher Tate
9865cafb92 Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev am: bf932b0067 am: 64613753d6 
am: b12e4e421f

* commit 'b12e4e421f86795f1c7c6cf849e7057fdfe70725':
  Purge an app's scheduled jobs when the whole package is disabled

Change-Id: I23eeab7bef3c3926b79406d4556079ea9d45540f
 2016-05-28 00:05:36 +00:00
Adrian Roos
3d0aa80a26 Merge "Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb am: 7aaf3aea00" into nyc-mr1-dev-plus-aosp 
am: ffac575150

* commit 'ffac5751507507f4452e790cdca22ee8787d8cc6':

Change-Id: Iab62f49a7893abc66edeaacdec56982b8b3901f4
 2016-05-28 00:05:32 +00:00
Adrian Roos
2d4dd2cdd6 Merge "Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: 389c4e67e9" into nyc-mr1-dev-plus-aosp 
am: e6446f90d1

* commit 'e6446f90d121d47e734099adeebc86bb9b72ae9c':

Change-Id: I56a7add944457381b636a3ab23ea3ccdd6ee7621
 2016-05-28 00:05:28 +00:00
Greg Hackmann
b7076b4491 Merge "Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051 am: 2c4b276df4 am: cac03c5cdf" into nyc-mr1-dev-plus-aosp 
am: f6753c8e7d

* commit 'f6753c8e7d44fcc3944430cb6d1d5d495efcb880':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: I51fbc1efabcbb8e2fde5392d4fe5ddcc12da4600
 2016-05-28 00:05:23 +00:00
Adrian Roos
8f8d98cd23 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb am: f563836a85 
am: d08158782c

* commit 'd08158782c191c61824c160afbcab4dccd53ce01':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: If18a2058b36f004ff3f3c53b625a9efd5bc2bb46
 2016-05-28 00:05:19 +00:00
Makoto Onuki
8c5578bcb0 Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev 2016-05-28 00:05:17 +00:00
Selim Cinek
ddf1b399d8 Fixed a few accessibility issues with notifications and groups 
Change-Id: I78fa62884eaa0efe825b5eb1e6cac7d88fc05a7f
Fixes: 28069681
 2016-05-27 17:04:56 -07:00
Doris Liu
d38541009b Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev 
am: d01f474773

* commit 'd01f474773792241fd67a98bc0a946ec4409be80':
  Add more doc for Object animators defined with a single value

Change-Id: I0f8db3135b7795d8ce40c7d78ce8d9180d3f3b1d
 2016-05-28 00:01:39 +00:00
Suprabh Shukla
6e215f895b Merge "Adding Reset Demo Notification" into nyc-mr1-dev 
am: 1b9f13d7bc

* commit '1b9f13d7bc35be59f88821393ed552b9c5a28f6d':
  Adding Reset Demo Notification

Change-Id: Idee3562505cb64f2ae9c8af120c7984d41418d70
 2016-05-28 00:01:36 +00:00
Jorim Jaggi
e525a35704 Fix multi-window enter animation 
Stable insets are not calculated in the first pass, so fetch it
manually if needed to avoid a relayout.

Bug: 28705801
Change-Id: I8f9a3bab96b597a80963d7ebcc8b19454b3e45a6
 2016-05-27 23:58:20 +00:00
Adrian Roos
6f9031778e Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: b35bd449a7 
am: 93276bd754

* commit '93276bd754577b79ddf76801f3e28c62a142ad09':
  Notification: Fix bug with sliding action list

Change-Id: I95013ba75ade60334bcd9ac7eeab7903e5df28fa
 2016-05-27 23:58:06 +00:00
Jorim Jaggi
1061a06e34 Merge "Fix weirdness when home task forces rotation am: a6c05d5151 am: 1f1d754440" into nyc-mr1-dev-plus-aosp 
am: 8f65100c07

* commit '8f65100c07b744ada117b60c12844a0ebe8a1b34':

Change-Id: I8ebc0de3d8ca6e80a22e96721b675a68c6036eac
 2016-05-27 23:58:01 +00:00
Jorim Jaggi
a7329a3ce4 Merge "Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 26dea2d518" into nyc-mr1-dev-plus-aosp 
am: 00f5ffb929

* commit '00f5ffb929fb61b7eeacc463ad52f2148de561ed':

Change-Id: I9bbbbc674e28771d4b5c46b04f9a48b1cd35a4f1
 2016-05-27 23:57:56 +00:00
Chong Zhang
8d54e042f5 Merge "Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804 am: 78b9d20449" into nyc-mr1-dev-plus-aosp 
am: 0316a937ce

* commit '0316a937ceb67acd4750073265583ef0f9749184':

Change-Id: I4db607178d2216deada0b1b3adc18119fd70a651
 2016-05-27 23:57:50 +00:00
Jorim Jaggi
373cc89727 Fix weirdness when home task forces rotation am: a6c05d5151 am: ca0e846528 
am: 9e5ec8eefe

* commit '9e5ec8eefed5e1e7eb842a158564fad6cedd5d3f':
  Fix weirdness when home task forces rotation

Change-Id: Ie254c705ef82defa8b566234675d83bb4ee9ac63
 2016-05-27 23:57:45 +00:00
Android Build Merger (Role)
d01f474773 Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev 2016-05-27 23:57:15 +00:00
TreeHugger Robot
1b9f13d7bc Merge "Adding Reset Demo Notification" into nyc-mr1-dev 2016-05-27 23:57:11 +00:00
Doris Liu
cf9df710e5 Merge "Add more doc for Object animators defined with a single value" into nyc-dev 
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I1be74292a21b0b9d86dd2df35c319f3a2f4a230c
 2016-05-27 23:56:51 +00:00
Doris Liu
55455b2da3 Merge "Add more doc for Object animators defined with a single value" into nyc-dev 
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I14cfe5e0a80832b57a270b5b34164d7e4232feeb
 2016-05-27 23:56:47 +00:00
Makoto Onuki
c421b31447 Fix build breakage due to res-id changes 
Change-Id: I3c8160b277e2dac83b433b5454d18b7253f5d0bd
 2016-05-27 16:54:04 -07:00
TreeHugger Robot
f97a0f5c9c Merge "Add more doc for Object animators defined with a single value" into nyc-dev 2016-05-27 23:51:18 +00:00
Jorim Jaggi
62538ce113 Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 819cbb3dd3 
am: bdcfbf442b

* commit 'bdcfbf442b8a8f46ece20cd9048430532cadcca4':
  Close IME when attaching dock stack

Change-Id: Id8ad2640a632f7d53f9f5ec175542fff4d3d7127
 2016-05-27 23:51:03 +00:00
Chong Zhang
3c584990bd Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804 am: 7414dad254 
am: f536ab9b26

* commit 'f536ab9b2614e5f5df8a39e92410220f44baacda':
  Revert commits related to wallpaper cropping

Change-Id: Ic42320ddd46fa0a93447c446b421c865969acce5
 2016-05-27 23:51:01 +00:00