Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,853 Commits 3 Branches 0 Tags
d42e70a583eaeb2609d4e8f8b047d1ec20d8aee9
Commit Graph

253853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
d42e70a583 Merge "Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682 am: 82dca23713" into nyc-mr1-dev-plus-aosp 2016-05-16 15:08:56 +00:00
Alan Viverette
48927fdd2a Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682 
am: 82dca23713

* commit '82dca237130a7a5035428debbd79285a277af449':

Change-Id: Ic84a1f6e8a53b54d75794c4aa724392d6ab61d8d
 2016-05-16 15:08:27 +00:00
Android Build Merger (Role)
53b1e902d9 Merge "Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev am: 8698ad8411 am: c78bae6dab" into nyc-mr1-dev-plus-aosp 2016-05-16 15:06:06 +00:00
Android Build Merger (Role)
0042308ee2 Merge "Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682 am: 82dca23713" into nyc-mr1-dev-plus-aosp 2016-05-16 15:05:54 +00:00
smain@google.com
53e5e1daf4 Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev am: 8698ad8411 
am: c78bae6dab

* commit 'c78bae6dab687054acad2f9ec642d1e99188097c':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: Ie8a13d7a437ba73fcb05f269480dacbe452f3d03
 2016-05-16 15:05:21 +00:00
Alan Viverette
2baf085908 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682 
am: 82dca23713

* commit '82dca237130a7a5035428debbd79285a277af449':
  Give the AM/PM buttons slightly more content area

Change-Id: I92b5abe6d9556f246260fd31fa5c6eadd059bd9f
 2016-05-16 15:05:15 +00:00
smain@google.com
3faa2cc949 Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev am: 8698ad8411 
am: 3b588f53a4

* commit '3b588f53a4818ebac1fc43e2a27d80b3fe114f47':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: If1910160502e665d5517dbaa397ae84ba2c98bcd
 2016-05-16 15:05:10 +00:00
Alan Viverette
ef64afe25d Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba682 
am: e3698ea7f0

* commit 'e3698ea7f03717f256dd8c307cbf7965adea1bf0':
  Give the AM/PM buttons slightly more content area

Change-Id: If660f16dd3f74b14bc3a8ae059776f8628ea57a2
 2016-05-16 15:05:05 +00:00
smain@google.com
3b588f53a4 Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev 
am: 8698ad8411

* commit '8698ad841187903ca562abf0ca438eab167eaca6':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: Ia6cca1434ce164e20b43af4943a1f9698e4cf205
 2016-05-16 15:02:11 +00:00
Alan Viverette
e3698ea7f0 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev 
am: bacbcba682

* commit 'bacbcba682df2d3e08e4e27f1aec3e2e0f57d7e5':
  Give the AM/PM buttons slightly more content area

Change-Id: I7a372c073252623a62d40a9aeec2c22576127499
 2016-05-16 15:02:06 +00:00
smain@google.com
c78bae6dab Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev 
am: 8698ad8411

* commit '8698ad841187903ca562abf0ca438eab167eaca6':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I1bd3f9e29583d034eff5ae3262dfe15088b7280d
 2016-05-16 15:02:04 +00:00
Alan Viverette
82dca23713 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev 
am: bacbcba682

* commit 'bacbcba682df2d3e08e4e27f1aec3e2e0f57d7e5':
  Give the AM/PM buttons slightly more content area

Change-Id: I381d492942dc6434df222a127c3f4bf6218b9843
 2016-05-16 15:02:00 +00:00
Android Build Merger (Role)
8698ad8411 Merge "Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 am: ccc6e09298" into nyc-dev 2016-05-16 14:59:27 +00:00
smain@google.com
6d8e37f622 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 am: 0c5c9747a7 
am: ccc6e09298

* commit 'ccc6e092989c07cd1939da33abc4e63234c6c671':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I18fe568063a1516e6cb1f367b209b07b84e8729d
 2016-05-16 14:59:02 +00:00
Alan Viverette
bacbcba682 Merge "Give the AM/PM buttons slightly more content area" into nyc-dev 2016-05-16 14:56:38 +00:00
Scott Main
ccc6e09298 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs am: b7f5631156 
am: 0c5c9747a7

* commit '0c5c9747a71bbb33ebf20ecc1f599a60a58238af':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I408d30923a3ef12375275f5d60dc9d55bf5e6548
 2016-05-16 14:55:47 +00:00
smain@google.com
0c5c9747a7 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs 
am: b7f5631156

* commit 'b7f5631156158c83d1eaa2e323267435edb66bf3':
  Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396

Change-Id: I5314afc6a3a42f43bb2f0a1484712b170773db63
 2016-05-16 14:52:44 +00:00
Scott Main
b7f5631156 Merge "Delete outdated sitemap file. Updated version now in Piper: https://critique.corp.google.com/#review/122362396" into mnc-mr-docs 2016-05-16 14:47:59 +00:00
Android Build Merger (Role)
b2d511be51 Merge "Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 am: 365eaeef5f" into nyc-mr1-dev-plus-aosp 2016-05-16 13:32:19 +00:00
Michael Wright
315a2a3940 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 
am: 365eaeef5f

* commit '365eaeef5fb511225f979fc2b55a32cbdcbd933c':

Change-Id: I078fe594349cb295d9d61b19ffc2cf91e6a4db6a
 2016-05-16 13:31:55 +00:00
Android Build Merger (Role)
c3882cae88 Merge "Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 am: 365eaeef5f" into nyc-mr1-dev-plus-aosp 2016-05-16 13:30:27 +00:00
Michael Wright
837b33ab9c Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 
am: 365eaeef5f

* commit '365eaeef5fb511225f979fc2b55a32cbdcbd933c':
  Stop emitting javadoc for @removed attributes.

Change-Id: Ib62aa382b5f626f98c1b560e0483a243d960d0e8
 2016-05-16 13:29:54 +00:00
Michael Wright
fab894efde Merge "Stop emitting javadoc for @removed attributes." into nyc-dev am: c4033e7c66 
am: 1d10d94396

* commit '1d10d9439635dd19fbb581d852dc0bf7bace364a':
  Stop emitting javadoc for @removed attributes.

Change-Id: Iefa1290cea72c3ddecb57157e61c39af7ce8383b
 2016-05-16 13:29:52 +00:00
Michael Wright
1d10d94396 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev 
am: c4033e7c66

* commit 'c4033e7c668abc1e671a130f70f58f885c63b176':
  Stop emitting javadoc for @removed attributes.

Change-Id: I7acaaf955f17be180cf311e8a265583cc5a938c6
 2016-05-16 13:27:01 +00:00
Michael Wright
365eaeef5f Merge "Stop emitting javadoc for @removed attributes." into nyc-dev 
am: c4033e7c66

* commit 'c4033e7c668abc1e671a130f70f58f885c63b176':
  Stop emitting javadoc for @removed attributes.

Change-Id: If48d0299c6d4d7179a366d902f23ada17315e42c
 2016-05-16 13:26:58 +00:00
TreeHugger Robot
c4033e7c66 Merge "Stop emitting javadoc for @removed attributes." into nyc-dev 2016-05-16 13:21:10 +00:00
Android Build Merger (Role)
883c25a510 Merge "LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 788a8a87ef" into nyc-mr1-dev-plus-aosp 2016-05-16 10:50:26 +00:00
Narayan Kamath
4a748c4b3a LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 
am: 788a8a87ef

* commit '788a8a87ef5be3ccbe9450c9502323f5c0c8196d':

Change-Id: I33579501a893d09bb2987289de5ab01b4675f9c1
 2016-05-16 10:50:03 +00:00
Android Build Merger (Role)
0aa0ce39b2 Merge "LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 788a8a87ef" into nyc-mr1-dev-plus-aosp 2016-05-16 10:48:48 +00:00
Narayan Kamath
7ef24b6752 LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 
am: 788a8a87ef

* commit '788a8a87ef5be3ccbe9450c9502323f5c0c8196d':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: Ic18957323ae4683cd0dadb0b7834f6b8167c3195
 2016-05-16 10:48:20 +00:00
Narayan Kamath
9bfcf64542 LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 
am: 150664c275

* commit '150664c27553ba06667d4ee7eafef16940a87788':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: Ie5b0fd3d47aa4121f4a5a054510c828a5f4e6454
 2016-05-16 10:48:17 +00:00
Narayan Kamath
150664c275 LoadedApk: Avoid unnecessary work when mIncludeCode == false. 
am: 8995b00ce8

* commit '8995b00ce8f68f2a285a97c2ce711bea8c61179e':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: Ib34104b27c85d4b74e8505ca3030ae5578ed4599
 2016-05-16 10:45:24 +00:00
Narayan Kamath
788a8a87ef LoadedApk: Avoid unnecessary work when mIncludeCode == false. 
am: 8995b00ce8

* commit '8995b00ce8f68f2a285a97c2ce711bea8c61179e':
  LoadedApk: Avoid unnecessary work when mIncludeCode == false.

Change-Id: I53ae61c1e5aed49f25ba473d33e3cbe27a475b4f
 2016-05-16 10:45:22 +00:00
Narayan Kamath
8995b00ce8 LoadedApk: Avoid unnecessary work when mIncludeCode == false. 
We don't need to set up JIT profiles and register usage etc when
the package context we're trying to construct doesn't request code.

This will correct accounting for packages which are only used for
resources.

bug: 28519185
Change-Id: I849675efa76c8100ae937de478b52254babe384c
 2016-05-16 10:39:08 +00:00
Android Build Merger (Role)
cf607e4c0d Merge "Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 am: 4fc4cf6528" into nyc-mr1-dev-plus-aosp 2016-05-16 09:49:43 +00:00
Abodunrinwa Toki
da57fe8e6c Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 
am: 4fc4cf6528

* commit '4fc4cf652822a8194b110bebe3e9caeb6ea75d2a':

Change-Id: Ied949f688a6d2659e464382ec6cca4e16f228f04
 2016-05-16 09:49:20 +00:00
Android Build Merger (Role)
dac1c79b7a Merge "Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 am: 4fc4cf6528" into nyc-mr1-dev-plus-aosp 2016-05-16 09:47:37 +00:00
Abodunrinwa Toki
65719145ef Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 
am: 4fc4cf6528

* commit '4fc4cf652822a8194b110bebe3e9caeb6ea75d2a':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: Iff1a4a674e02a9bc121961b0fa306d1b5afa32c8
 2016-05-16 09:47:07 +00:00
Abodunrinwa Toki
58056cf0bc Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev am: 376f9f4bd6 
am: 03e7feeba3

* commit '03e7feeba33b565dd09cb77834caa643b6dff0e9':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: If5557d0a968e263b4252566566621b522ffb5617
 2016-05-16 09:47:03 +00:00
Abodunrinwa Toki
03e7feeba3 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev 
am: 376f9f4bd6

* commit '376f9f4bd6ba2e117f0356161c767225f47f2745':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: I35ef50e803c17df3911bee580e604992768df484
 2016-05-16 09:44:05 +00:00
Abodunrinwa Toki
4fc4cf6528 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev 
am: 376f9f4bd6

* commit '376f9f4bd6ba2e117f0356161c767225f47f2745':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: I84041bf0414518f747d2f1a09bd8c154f74347b9
 2016-05-16 09:44:03 +00:00
Abodunrinwa Toki
376f9f4bd6 Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev 2016-05-16 09:37:56 +00:00
Android Build Merger (Role)
7ba17feb32 Merge "Merge "Address API review comments." into nyc-dev am: 9a32929def am: a87343fbeb" into nyc-mr1-dev-plus-aosp 2016-05-16 09:32:06 +00:00
Martijn Coenen
1520c6485a Merge "Address API review comments." into nyc-dev am: 9a32929def 
am: a87343fbeb

* commit 'a87343fbeb2986826e56989ea93e143aaa4a7bb5':

Change-Id: I5c761089d1456e3184b788d20527a5db509f6034
 2016-05-16 09:31:39 +00:00
Android Build Merger (Role)
8e8bca105f Merge "Merge "Address API review comments." into nyc-dev am: 9a32929def am: a87343fbeb" into nyc-mr1-dev-plus-aosp 2016-05-16 09:29:36 +00:00
Martijn Coenen
91fab60801 Merge "Address API review comments." into nyc-dev am: 9a32929def 
am: a87343fbeb

* commit 'a87343fbeb2986826e56989ea93e143aaa4a7bb5':
  Address API review comments.

Change-Id: Ia94f104c94b31a7e6fa579ced3046260117337f6
 2016-05-16 09:29:02 +00:00
Martijn Coenen
2386212c05 Merge "Address API review comments." into nyc-dev am: 9a32929def 
am: 1ffef9a239

* commit '1ffef9a239a67016607f62dfd023bf7fefb85370':
  Address API review comments.

Change-Id: I1f7da4c07988923b22bfab5689d48531cfb95aa1
 2016-05-16 09:28:57 +00:00
Martijn Coenen
1ffef9a239 Merge "Address API review comments." into nyc-dev 
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f
 2016-05-16 09:25:58 +00:00
Martijn Coenen
a87343fbeb Merge "Address API review comments." into nyc-dev 
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Id397091f72c9ca3d50809a3e029e8b12ee86ea26
 2016-05-16 09:25:57 +00:00
Martijn Coenen
9a32929def Merge "Address API review comments." into nyc-dev 2016-05-16 09:18:36 +00:00