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
Jeremy Joslin
a8360d3624 Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 
am: b17d1a36fb

* commit 'b17d1a36fb984be78e78118754d8be1564e957ae':
  Fix issue #28930592: Scoring service binding is not reestablished.

Change-Id: Ie3283de235cad4737d40b1d3b21e5fcb2b6cd2eb
 2016-05-27 23:20:25 +00:00
Adrian Roos
4881d58185 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 5dbb9ff674 
am: 7d4da18d03

* commit '7d4da18d039712c3e425626e735db8b5fb973594':
  Fix bad one-line MessagingStyle

Change-Id: I0596bb8e7f68f32f8d9f78a26ced867072877e5a
 2016-05-27 23:20:01 +00:00
Adrian Roos
9a8004a4d2 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 2c69d1ecae 
am: f986b700de

* commit 'f986b700de4f04431ae9e0f2d3bba36f8b3c51f6':

Change-Id: Ie26b515517259a3181dbca8e29f5246c3a7051d9
 2016-05-27 23:19:58 +00:00
Hemal Patel
23919c37c9 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 8d8718fc53 
am: 6396bf5e28

* commit '6396bf5e2840a0ad24af9854864fb405b4d8ae57':

Change-Id: I7374e089abeb3b076f8db3ff9c09b501453ee86d
 2016-05-27 23:19:54 +00:00
Hemal Patel
c7b74e5994 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: 2b9497069d 
am: ffc5ae0721

* commit 'ffc5ae0721dbf57031fdc3f6f52fe6de27b71d6c':

Change-Id: Ieff0c1a358cdf11b138f1c6647a0d2f985207d83
 2016-05-27 23:19:51 +00:00
Hemal Patel
cdc8eaca8b Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535 
am: b19774bd32

* commit 'b19774bd321059c698c8a30867eb56d86097e16c':

Change-Id: I1e301f4500b46a9135a048916f063f00989dd4a9
 2016-05-27 23:19:48 +00:00
Hang Yin
b8c227aeef Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 
am: a23ed40af7

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

Change-Id: Id0685e3a24435ca92451501f76191f63a662c502
 2016-05-27 23:18:49 +00:00
Doris Liu
ea58b67592 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev am: fceaa60e24 
am: 8fc70289b5

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

Change-Id: Ie6207d610a8780ba06ae4b3941a5ac401f0f35b1
 2016-05-27 23:18:48 +00:00
Adrian Roos
f0b8f05a76 Merge "Change app crash dialog strings" into nyc-dev am: a7d66aa6b8 
am: ca89f7b69f

* commit 'ca89f7b69f5a4737105ac28133f8af3ada57e46f':
  Change app crash dialog strings

Change-Id: Id0f6be68e14214fba8acfc34a46a30e176dc2378
 2016-05-27 23:18:46 +00:00
smain@google.com
f92f6351b6 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 am: 3152ead0f8 
am: c26b8afd35

* commit 'c26b8afd35c2debf14cdefb6120b908cfb9ef5c3':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I3588745db102813ca7fd2c3d7f646a8c1ed3378e
 2016-05-27 23:18:46 +00:00
Adrian Roos
f9048f0d47 Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 
am: 20962d345a

* commit '20962d345ac294ef2000576f23d672e7f0883069':
  Simplify crash dialog

Change-Id: Id16c690ecfae4837175d78404c85fa7ce8c82f32
 2016-05-27 23:18:44 +00:00
Adrian Roos
2210e541bf Merge "Fix status bar autohide with DirectReply" into nyc-dev 
am: e3e80bde12

* commit 'e3e80bde1246ed403be3315dcb1b92edc326aaf7':
  Fix status bar autohide with DirectReply

Change-Id: I403dced0a5e78a61a392383ad3112c9da0d3c27a
 2016-05-27 23:18:43 +00:00
Adrian Roos
c67191508b Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 
am: d70126ec78

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

Change-Id: Iba2e4bb6be2dcb6e1800b8863046084a3540a0f2
 2016-05-27 23:18:42 +00:00
Joe Fernandez
e6a5e9ad6b Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev 
am: ddb8133841

* commit 'ddb8133841e7a85c4697e9cbcf601768e435e83b':
  docs: update redirects for GMS and GCM reference docs

Change-Id: Ifdbab02807491b65706a7eba6f7ac75d0bfb92bf
 2016-05-27 23:18:41 +00:00
Adrian Roos
5cdc958240 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 2c69d1ecae 
am: 85e60d203e

* commit '85e60d203e4ec8d1c1db9ff55cdc6057a48a7812':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I030e9b054ed62cb676223a1c1638e0da047002ed
 2016-05-27 23:16:43 +00:00
Jeremy Joslin
0b6676d7bc Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev 
am: 49b515a2a5

* commit '49b515a2a5d602ddb24d146d3b6ada54a496b6c2':
  Fix issue #28930592: Scoring service binding is not reestablished.

Change-Id: I6468641835c8ca50a3516146c3107fa7c59f855c
 2016-05-27 23:16:42 +00:00
Hemal Patel
fc5427e983 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 8d8718fc53 
am: 2e63ef3cac

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

Change-Id: Ieebca04ad775d408896abf591723350ab67f23c7
 2016-05-27 23:16:40 +00:00
Hang Yin
e6880cbef9 Merge "Code Patch for camera preview switch tests" into nyc-dev 
am: 5c950a8078

* commit '5c950a8078e37eb9057da4aa5b3355189b675291':
  Code Patch for camera preview switch tests

Change-Id: I79c8f93d3c161aab19d35cc9fe02ae474b8949a5
 2016-05-27 23:16:40 +00:00
Hemal Patel
a76824e029 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 am: 2b9497069d 
am: 6501ac3bf9

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

Change-Id: Icfad7163cfd3beeab6704c033d9a4a92f893d4ed
 2016-05-27 23:16:38 +00:00
Doris Liu
fe0a4e4189 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev 
am: fceaa60e24

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

Change-Id: I539bbbbf5ad57c3d79ac3e2a4517ac160379c6cf
 2016-05-27 23:16:36 +00:00
Hemal Patel
c84e814234 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev am: d63315e535 
am: 3921ba2f61

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

Change-Id: I259fcb700f0841f92b76c8057a86c378afab74c0
 2016-05-27 23:16:34 +00:00
Adrian Roos
b87023903e Merge "Change app crash dialog strings" into nyc-dev 
am: a7d66aa6b8

* commit 'a7d66aa6b86865b223bd3b0d906b9a0f95e7c3b5':
  Change app crash dialog strings

Change-Id: I45b1d5663e0ee45b59155883757850efedbdfe31
 2016-05-27 23:16:33 +00:00
Akshay Thakker
904639a8f0 Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: 82a8c5f246 
am: 7eb543ef2c

* commit '7eb543ef2c8ea8ce1307fd3839386b677e3013da':

Change-Id: Ie54ecaaa34938fbf84155e56f70ccc96f2ed6901
 2016-05-27 23:16:31 +00:00
Adrian Roos
b1ca71dc16 Merge "Simplify crash dialog" into nyc-dev 
am: 9764fea483

* commit '9764fea48350e9148b606f8e10686e298437e440':
  Simplify crash dialog

Change-Id: Idbe8524005b63fe008fa01dde96b9408eceaefc6
 2016-05-27 23:16:31 +00:00
Bart Sears
56e2b4a83e Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 
am: ffc8723d88

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

Change-Id: Icaf17a36cf1fea5f95610fb055faf65d90021abe
 2016-05-27 23:14:57 +00:00
Adrian Roos
7d4da18d03 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I1b6cf5033b970aea74fed1ac07c93fe69b7fb1de
 2016-05-27 23:12:29 +00:00
Hemal Patel
f986b700de Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf 
am: 2c69d1ecae

* commit '2c69d1ecae5efff06a29bec3d73f9654b8851972':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I9983d40ed0da917ea7f19df60b8f36e760dc26d7
 2016-05-27 23:12:24 +00:00
Hemal Patel
6396bf5e28 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 
am: 8d8718fc53

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

Change-Id: I6328e016fa56e110832281a4c2e7b42cc673e3f8
 2016-05-27 23:12:18 +00:00
Hemal Patel
ffc5ae0721 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 
am: 2b9497069d

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

Change-Id: Ib636c5df935f12b70092792796ae2a3cde995cd1
 2016-05-27 23:12:13 +00:00
Michael Wright
b19774bd32 Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: d63315e535

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

Change-Id: Icb8763a976ea1768f8dfb68875d87dcb0a53cca5
 2016-05-27 23:12:07 +00:00
Makoto Onuki
09c6612288 resolve merge conflicts of 8de7c95 to master 
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
 2016-05-27 16:10:34 -07:00
Bart Sears
ffc8723d88 Merge "resolve merge conflicts of 82a8c5f to nyc-mr1-dev" into nyc-mr1-dev 2016-05-27 23:09:24 +00:00
smain@google.com
6d6e6d2457 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 am: 3152ead0f8 
am: c26b8afd35

* commit 'c26b8afd35c2debf14cdefb6120b908cfb9ef5c3':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I28198ddb49b95c07aeb5ec90135bcb57533ce8d2
 2016-05-27 23:08:00 +00:00
smain@google.com
c26b8afd35 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 am: d6c76ddc51 
am: 3152ead0f8

* commit '3152ead0f8cb5994100a423b47907db06d8e0d7b':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: I8ec4aee36c2f39f9590fe94ffa8fa7b8da90cf43
 2016-05-27 23:02:25 +00:00
Bart Sears
f87ee48da9 resolve merge conflicts of 82a8c5f to nyc-mr1-dev 
Change-Id: I7ba17e4b36997684d5f542900a81a03d28228a7a
 2016-05-27 16:02:22 -07:00
Adrian Roos
9fb91a6c04 Merge "Fix status bar autohide with DirectReply" into nyc-dev 
am: e3e80bde12

* commit 'e3e80bde1246ed403be3315dcb1b92edc326aaf7':
  Fix status bar autohide with DirectReply

Change-Id: I9f86201ef1569ac06f09c704f1dce480de750d95
 2016-05-27 23:02:09 +00:00
Yigit Boyar
51b5caf902 Invalidate child bounds when AbsListView bounds change 
This CL fixes a bug in AbsListView where it was not invalidating
children's bounds when AbsListView's bounds change. This was
triggering bugs where if you set padding on a list view, it would
not resize its children.

Bug: 28800232
Change-Id: I81a4e9ea234c395de80efea5ef5e47a71cb95136
 2016-05-27 16:00:22 -07:00
smain@google.com
3152ead0f8 redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890 
am: d6c76ddc51

* commit 'd6c76ddc51a1b607c50d8e443a7affb9b2e0e1b6':
  redirect adt guide to release notes to consolidate the deprecation message. related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia14317cc6a292fcda6328d96660db0eda5757e12
 2016-05-27 22:56:53 +00:00
Julia Reynolds
9b1e8ba9ea Merge "Merge "Announce upcoming tile state on click." into nyc-dev am: 293c967667 am: 4d55281b08" into nyc-mr1-dev-plus-aosp 
am: 1e56074899

* commit '1e560748995433ed323a8eeaf7e7f27c9f498dd3':

Change-Id: Iacf6e2eaa85216f825ab02d52cfb9c682a91285a
 2016-05-27 22:55:46 +00:00
Adrian Roos
e3e80bde12 Merge "Fix status bar autohide with DirectReply" into nyc-dev 2016-05-27 22:55:00 +00:00
Julia Reynolds
4484369da6 Merge "Announce upcoming tile state on click." into nyc-dev am: 293c967667 am: 0a5b17a1dc 
am: 4181eeddff

* commit '4181eeddff1e31c3d90c72d4c4f98ecb46e6db46':
  Announce upcoming tile state on click.

Change-Id: Ic84d76bc5f5403ede1c10f3f80af0ae3a27e3150
 2016-05-27 22:53:54 +00:00
Ruchi Kandoi
7d9cc9aa7a Merge "Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 am: cea28a3935" into nyc-mr1-dev-plus-aosp 
am: e27d8d7e07

* commit 'e27d8d7e076db2e2b5abb04d0a54f82c765a7d52':

Change-Id: Ica7e982c520aa0833ec7bf22a48f9ea1a7542a7b
 2016-05-27 22:53:52 +00:00
Ruchi Kandoi
3dc9df699b Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 am: e9f42318f6 
am: fcb3aa4a68

* commit 'fcb3aa4a681021c95f55673f18141502667320e3':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: I2acde231a58d82ea15a20757dbf3bac8f9edbba6
 2016-05-27 22:53:48 +00:00
Alan Viverette
e40e318b4f Merge "resolve merge conflicts of f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 9ab249bef2 
am: 32148220f7

* commit '32148220f7e31ca100fad42c31841159aa639be4':
  Chronometer: Update the value only if displayed on screen

Change-Id: Icf53d90ea83f54457b77bec28291efe92b4c1c88
 2016-05-27 22:53:45 +00:00
Paul Jensen
746a31fa40 Merge "Merge "Don\'t drop IPv4 broadcast packets when WiFi multicast lock is held" into nyc-dev am: 83e50327fc am: e8b8f1b48e" into nyc-mr1-dev-plus-aosp 
am: 52925fd02e

* commit '52925fd02eb14c7f1ca3469bead0c73e0c849f77':

Change-Id: I03ef98df0fb2758638a3cf308f0e517e8b417140
 2016-05-27 22:53:42 +00:00
Makoto Onuki
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
 2016-05-27 22:52:43 +00:00
Joe Fernandez
f6ccafda22 Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev 
am: ddb8133841

* commit 'ddb8133841e7a85c4697e9cbcf601768e435e83b':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I007c32014960ff6fa856a77166a41be8c7aee948
 2016-05-27 22:51:53 +00:00
Jeremy Joslin
b17d1a36fb Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev 
am: 49b515a2a5

* commit '49b515a2a5d602ddb24d146d3b6ada54a496b6c2':
  Fix issue #28930592: Scoring service binding is not reestablished.

Change-Id: I3fdb0cb78e2991810ee7e62e901638be71272895
 2016-05-27 22:51:49 +00:00
Adrian Roos
33fbd2c965 MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT 
Generates an appropriate title and text for MessagingStyle
Notifications, such that SystemUI can generate the appropriate
oneline representation.

Bug: 28934989
Change-Id: Ic23ed18bb9c4af21ad59626ca161ca7abb25a4e9
 2016-05-27 15:49:05 -07:00
smain@google.com
d6c76ddc51 redirect adt guide to release notes to consolidate the deprecation message. 
related deletion of file: https://critique.corp.google.com/#review/123463890

Change-Id: Ia9b533ec52a0fd05fcfeede04dda64ae6041c6a2
 2016-05-27 15:48:44 -07:00