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
Selim Cinek
37dae84bc6 Merge "Added strings for translation with the expand affordance" into nyc-dev am: 08c46581a2 am: fb9d25e14a 
am: 8854328be0

* commit '8854328be080c903932e4bf13f5fdf055a546c0f':

Change-Id: I4912cf0ff16c4a5dbac9222abe34293966d3a155
 2016-05-27 23:50:59 +00:00
Selim Cinek
e654090edc Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166 am: 0d33e08779 
am: 4ded23e0ab

* commit '4ded23e0abb06ddc7bfaa92182a2997bcf35b776':

Change-Id: Id396d3e91b90ae563103223ecfd13a18ed0f48b4
 2016-05-27 23:50:57 +00:00
Selim Cinek
903788feaa Merge "Added strings for translation with the expand affordance" into nyc-dev am: 08c46581a2 am: 96b28a7e67 
am: cbbac3d499

* commit 'cbbac3d49907925da9ce22cda5ae46a6ab5467f9':
  Added strings for translation with the expand affordance

Change-Id: I180e4cef93cef86ea8a242a9f5f2d5e8759d8ba0
 2016-05-27 23:50:55 +00:00
Selim Cinek
a4a8945391 Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166 am: 48eb3702fe 
am: 056712327a

* commit '056712327a6daa3475477738a77611056314719d':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I89cebb051980d729a2eb9f4e49a93055959bfd07
 2016-05-27 23:43:20 +00:00
Felipe Leme
037ea33b85 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: feaa8982fc 
am: 0128d64c38

* commit '0128d64c389a148d636ea3389acdcc06c73cd76f':

Change-Id: I8f2f31282e1031e9ae438a5b3ff483cedf5352b8
 2016-05-27 23:43:18 +00:00
Felipe Leme
6afa2e1d1d Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9 
am: d786355405

* commit 'd786355405dfb50b1e6eb0bb8628276b9b2823c6':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ic8f6cbfce572c54d7124a508af12043a58d5bc66
 2016-05-27 23:43:14 +00:00
Danny Epstein
febfc21e6d Merge "Top and bottom padding for watch preferences." into nyc-mr1-dev am: c17513ef37 
am: e85305267e

* commit 'e85305267efef1c6d58929b7540c74960397ac2b':
  Top and bottom padding for watch preferences.

Change-Id: Ib4818b6e9dd287a5cf103398f1c46886dfb42ab0
 2016-05-27 23:43:12 +00:00
Amith Yamasani
8adc553b3e Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev am: 5df14a60cf 
am: df2297dcf3

* commit 'df2297dcf3b3a923207d1598dc4f6af0c1759241':
  Helper method to check if current user is a demo user

Change-Id: I8149210498462036659c1b6b8e8dd322e6dfa336
 2016-05-27 23:43:10 +00:00
Makoto Onuki
92aca78996 Merge "Fix the feldspar-dev branch" into nyc-mr1-dev am: 7c65d085f4 
am: 0b94321ecc

* commit '0b94321ecc9c098e4af5fadcf6a300a6baac1cbe':
  Fix the feldspar-dev branch

Change-Id: I771d9e620a9e627cc4f76d16e6b838f7b2fae678
 2016-05-27 23:41:01 +00:00
Selim Cinek
2745da17e0 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev am: 4f401f24c7 am: 077ba466d4 
am: 268aa24fe6

* commit '268aa24fe6109e4b6baf9ce9272594a7bb8bc440':

Change-Id: Ib333dc3844c5dd681b6d2d5d4a466e5fbfa27a09
 2016-05-27 23:40:59 +00:00
Selim Cinek
e7faa8c520 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev am: 4f401f24c7 am: d6e5332169 
am: e431e1e1e3

* commit 'e431e1e1e35efdc4abcf72497346f9418eea381c':
  Fixed a few memory leaks in SystemUI

Change-Id: I9f617082d8be83e60bb7c8524fcabd9d4d29650e
 2016-05-27 23:40:57 +00:00
Siyamed Sinir
e4fb5bdbd9 Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 4dc77b7a5e 
am: 4e96f6de03

* commit '4e96f6de033cfc6d14398e321f783583d1881382':

Change-Id: I9b405db1b30fbdbf6d84af16d48c5e439cb5ac28
 2016-05-27 23:40:55 +00:00
Siyamed Sinir
06ce394edc Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 6fe1ab7f21 
am: af57bd751f

* commit 'af57bd751f9402a54db3cb60dd7c93a8106ae2b0':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I6c4865dceff4debb17e679a67ffbb3d7eb33f817
 2016-05-27 23:40:53 +00:00
Siyamed Sinir
7d94537ebd Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 3f23dad913" into nyc-mr1-dev-plus-aosp 
am: 39cc3f20c2

* commit '39cc3f20c28dcc6a2b5bd5b8290a28244cf778a6':

Change-Id: I032425a07bc2b1d8a31cdd6fd08737a7b435c153
 2016-05-27 23:40:14 +00:00
Siyamed Sinir
686e0545c7 Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 361f03c4e2 
am: 3e7177f91f

* commit '3e7177f91f7e7097dcc4f6613c8baf7fff5a333e':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: Ic21d60a789a0361ffca8362621fa03ded8d96ae5
 2016-05-27 23:40:05 +00:00
Chih-hung Hsieh
b21f69181f Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400 am: 86f5b560af 
am: 1099ea59c5

* commit '1099ea59c575f4445364359cfa74d9afb6d1dd4d':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I7ddd16cdf438ab53726ea546c86e6f9e9b6027ce
 2016-05-27 23:37:43 +00:00
Mark Goldstein
688e2ffb5b Merge "Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 am: 7f1330358a am: 1743e97f3a" into nyc-mr1-dev-plus-aosp 
am: 747c16c1e0

* commit '747c16c1e08ad9a7a107fc90ed2e4a6f8762bc3a':

Change-Id: I09b44bca1abd9b75dc49de084cd1e9c658ec4e03
 2016-05-27 23:37:41 +00:00
Mark Goldstein
f199b8bd89 Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 am: 7f1330358a am: 90045710ca 
am: 29c870e4e2

* commit '29c870e4e254b741baf0e99257640ba0fac77102':
  Doc change: Fix broken link.

Change-Id: I1e1815f6437aac9190849b5ed618cb97aa30e7ef
 2016-05-27 23:37:37 +00:00
Jaewan Kim
76a42690a7 Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db7f am: cac5be859f 
am: 831ddb659e

* commit '831ddb659e9af7634be65b0c3d997b929a658981':

Change-Id: I9b748064506f5f9b5207263d2fafd138cf87276a
 2016-05-27 23:37:35 +00:00
Jason Monk
52fa8ab6c2 Merge "QS: Handle detail scroll properly" into nyc-dev am: 4f620d423f am: 582ee3eb65 
am: eb93365269

* commit 'eb933652690182689de5c34ca188409e8c37906e':

Change-Id: I6da52a09a7060862a9c6550ec6034cdfbab8f660
 2016-05-27 23:37:33 +00:00
Chris Wren
12da5fce6c Merge "add metrics for gestural notification expansions" into nyc-dev am: cd9ea74659 am: 14c87a5f3f 
am: 0c99119f8f

* commit '0c99119f8f32fc7a34aa708cb794f52fadccc072':

Change-Id: I387fcaba8566173f2281e12e90dd95c46f265ce1
 2016-05-27 23:35:45 +00:00
Jaewan Kim
737458b048 Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db7f am: 9e78ee80b8 
am: a8d75f8c1c

* commit 'a8d75f8c1c25c488ed817bd16b1462f192282a6b':
  PIP: Improve PIP control row's focus change animation in Recents

Change-Id: Ie274501fa85bbee8c7d7accc37bdd420158799dd
 2016-05-27 23:35:41 +00:00
Jason Monk
d28d0dadd9 Merge "QS: Handle detail scroll properly" into nyc-dev am: 4f620d423f am: 11aa8b009f 
am: 295619694c

* commit '295619694ce1a1726d92afd1862c98041ea82f76':
  QS: Handle detail scroll properly

Change-Id: I5f4f17a72e8530b93cc853b67438f7e6631b4037
 2016-05-27 23:35:39 +00:00
Amith Yamasani
69c76ce387 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565 
am: a3bc135bb4

* commit 'a3bc135bb413bb159847926e0ccdf99acf125360':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Ifa8f6f8e195bca93af058914c5b1797f3294df6e
 2016-05-27 23:35:36 +00:00
Chris Wren
7c0bd20333 resolve merge conflicts of cd9ea74 to nyc-mr1-dev am: 7ee8418076 
am: 318f923e4f

* commit '318f923e4f57a7babd79373660e00aa4cef329b7':
  add metrics for gestural notification expansions

Change-Id: Ia7b0decd5601195cd3eaddf09c5c460a8b3364a0
 2016-05-27 23:35:34 +00:00
smain@google.com
a652237736 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 
am: f92f6351b6

* commit 'f92f6351b6bab702e986aa191f84a4fc831d36ad':

Change-Id: Ibad1614f55c787f2585bf824855a2d69297b414f
 2016-05-27 23:29:12 +00:00
Adrian Roos
3340e5fad6 Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 
am: 2210e541bf

* commit '2210e541bff1015b5f82e67c07eac6ec4c2b1daf':

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

* commit 'e6a5e9ad6b1900e0cdd216096f911f4f1fdac8c7':

Change-Id: I826c484083930a6a7f2edaed2cc9f40a267abcd6
 2016-05-27 23:28:56 +00:00
Android Build Merger (Role)
ebbe6e702b Merge "Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 am: 0b6676d7bc" into nyc-mr1-dev-plus-aosp 2016-05-27 23:24:14 +00:00
Android Build Merger (Role)
dee676b3f9 Merge "Merge "Code Patch for camera preview switch tests" into nyc-dev am: 5c950a8078 am: e6880cbef9" into nyc-mr1-dev-plus-aosp 2016-05-27 23:24:01 +00:00
Android Build Merger (Role)
841aa5fb03 Merge "Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev am: fceaa60e24 am: fe0a4e4189" into nyc-mr1-dev-plus-aosp 2016-05-27 23:23:52 +00:00
Android Build Merger (Role)
0a98887f25 Merge "Merge "Change app crash dialog strings" into nyc-dev am: a7d66aa6b8 am: b87023903e" into nyc-mr1-dev-plus-aosp 2016-05-27 23:23:42 +00:00
Android Build Merger (Role)
4dc61a31fc Merge "Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 am: b1ca71dc16" into nyc-mr1-dev-plus-aosp 2016-05-27 23:23:30 +00:00
Jeremy Joslin
90f7ae5470 Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 
am: 0b6676d7bc

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

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

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

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

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

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

* commit 'b87023903e609fd76616676b01e8f0d10c9abe09':
  Change app crash dialog strings

Change-Id: I89da0fc15a6326a8b85aa1ada8c9f0726d27d6f7
 2016-05-27 23:22:13 +00:00
Adrian Roos
aabd7c3af0 Merge "Simplify crash dialog" into nyc-dev am: 9764fea483 
am: b1ca71dc16

* commit 'b1ca71dc164c2111f2c466daf2a75672f7fd05b0':
  Simplify crash dialog

Change-Id: I6376ac46b6314e0e8e9848f213b8b667b7c8abcd
 2016-05-27 23:22:10 +00:00
Android Build Merger (Role)
8f69279e5a Merge "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 am: 6d6e6d2457" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:49 +00:00
Android Build Merger (Role)
d29ac4b966 Merge "Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 am: 9fb91a6c04" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:40 +00:00
Android Build Merger (Role)
3b1e450281 Merge "Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 5dbb9ff674 am: 7d4da18d03" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:29 +00:00
Android Build Merger (Role)
dea953615d Merge "Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev am: ddb8133841 am: f6ccafda22" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:25 +00:00
Android Build Merger (Role)
2ce41e61a6 Merge "Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf am: 2c69d1ecae am: f986b700de" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:21 +00:00
Android Build Merger (Role)
4a923e9d49 Merge "Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev am: 49b515a2a5 am: b17d1a36fb" into nyc-mr1-dev-plus-aosp 2016-05-27 23:21:15 +00:00
Android Build Merger (Role)
3f6f5de2fa 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 2016-05-27 23:21:10 +00:00
Android Build Merger (Role)
5d2e916386 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 2016-05-27 23:20:53 +00:00
Android Build Merger (Role)
0292052c87 Merge "Merge "Revert "Finalize resource IDs for N."" into nyc-dev am: d63315e535 am: b19774bd32" into nyc-mr1-dev-plus-aosp 2016-05-27 23:20:40 +00:00
smain@google.com
0115cc893e 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 
am: 6d6e6d2457

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

Change-Id: I0c8638f520fc7b46f52da30e377ced66a743d50a
 2016-05-27 23:20:30 +00:00
Adrian Roos
35970ad1d6 Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 
am: 9fb91a6c04

* commit '9fb91a6c04b055f08a837c42848623de423160c1':
  Fix status bar autohide with DirectReply

Change-Id: I427ab905d3089d6dd1de385844c478c9dee645e4
 2016-05-27 23:20:28 +00:00
Joe Fernandez
22772736ed Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev am: ddb8133841 
am: f6ccafda22

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

Change-Id: Ic20edbed487cda6f7f3a97f769487cc1b6f468e1
 2016-05-27 23:20:27 +00:00