Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,584 Commits 3 Branches 0 Tags
638243edca9696bbb58fde334babe7536c4b65df
Commit Graph

252584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
638243edca Merge "Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca am: 8e03a859cc" into nyc-mr1-dev-plus-aosp 2016-05-11 22:48:47 +00:00
Yigit Boyar
ba4aff3ada Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca 
am: 8e03a859cc

* commit '8e03a859cca66c91fad5395ba2ebb795a293c112':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: Ic72fa3df5a039e6f330e497cfc0a8a046f94e0d3
 2016-05-11 22:48:24 +00:00
Yigit Boyar
cac41c969f Merge changes I6e3f4da2,I8acfbd1a into nyc-dev am: 1a97cbd4ca 
am: c8777a833a

* commit 'c8777a833a165ed5025b18540cc2d25faa6ea744':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I3d58765bcb7264892f0280b37b702e3dbbccdfd4
 2016-05-11 22:48:16 +00:00
Yigit Boyar
8e03a859cc Merge changes I6e3f4da2,I8acfbd1a into nyc-dev 
am: 1a97cbd4ca

* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I8ab90fd32e4dabf61f7becd0897742a5e637f8ab
 2016-05-11 22:42:09 +00:00
Yigit Boyar
c8777a833a Merge changes I6e3f4da2,I8acfbd1a into nyc-dev 
am: 1a97cbd4ca

* commit '1a97cbd4ca9670cacfd04fb9a4d42348d22cc98c':
  Fully detach unused scrap views
  Remove detached headers

Change-Id: I30a02773e4cfb05e3e6ee224d829b4c380eb00f0
 2016-05-11 22:42:06 +00:00
Yigit Boyar
1a97cbd4ca Merge changes I6e3f4da2,I8acfbd1a into nyc-dev 
* changes:
  Fully detach unused scrap views
  Remove detached headers
 2016-05-11 22:32:05 +00:00
Android Build Merger (Role)
c614d4ed78 Merge "Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365bb am: 51335db632" into nyc-mr1-dev-plus-aosp 2016-05-11 22:19:41 +00:00
Android Build Merger (Role)
99b4c8854b Merge "Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565 am: db607a6cde" into nyc-mr1-dev-plus-aosp 2016-05-11 22:19:29 +00:00
Chong Zhang
a42decf30a Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365bb 
am: 51335db632

* commit '51335db63290927550a242faa167cbc138ce6f5c':
  Deliver new activity options after the activity is made visible

Change-Id: I31068eef755e82f3e9e1e5cb00855012f727789a
 2016-05-11 22:19:08 +00:00
Chong Zhang
5e5daca931 Merge "Deliver new activity options after the activity is made visible" into nyc-dev am: e9f5d365bb 
am: 9396f7e64e

* commit '9396f7e64efc3d7f32b8720db63a75b21ccc8d5c':
  Deliver new activity options after the activity is made visible

Change-Id: I24abb86db14882ec5ac05981d9944011e5154645
 2016-05-11 22:18:24 +00:00
sergeyv
fd27d094b8 Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565 
am: db607a6cde

* commit 'db607a6cded8cae1876198ef5f28964dab185eee':

Change-Id: Icb0d03094473c688b9834b92673f34a9e1a73142
 2016-05-11 22:17:55 +00:00
Android Build Merger (Role)
ae8a928350 Merge "Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565 am: ac26a7c427" into nyc-mr1-dev-plus-aosp 2016-05-11 22:12:08 +00:00
sergeyv
da5cbe00ab Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565 
am: ac26a7c427

* commit 'ac26a7c42776e0feb2a30729ba178169e33dc927':
  Draw textShadow always first.

Change-Id: I6c5d8f8a5f08359fbd1bd2fe9b9ab152f7465475
 2016-05-11 22:11:44 +00:00
Chong Zhang
51335db632 Merge "Deliver new activity options after the activity is made visible" into nyc-dev 
am: e9f5d365bb

* commit 'e9f5d365bb740edade62290d1d835902a58cfdf2':
  Deliver new activity options after the activity is made visible

Change-Id: If1a902d4fb7ebfa5d2b08ab495195f7e90e20340
 2016-05-11 22:09:36 +00:00
Chong Zhang
9396f7e64e Merge "Deliver new activity options after the activity is made visible" into nyc-dev 
am: e9f5d365bb

* commit 'e9f5d365bb740edade62290d1d835902a58cfdf2':
  Deliver new activity options after the activity is made visible

Change-Id: I8dc17b803f56a47e29518026e6b6e223a0964ff8
 2016-05-11 22:09:28 +00:00
Android Build Merger (Role)
03e7dac7fa Merge "Merge "Less lazy child FragmentManager creation" into nyc-dev am: 6437dac3d9 am: 3b981d026c" into nyc-mr1-dev-plus-aosp 2016-05-11 22:01:23 +00:00
Adam Powell
24959fa009 Merge "Less lazy child FragmentManager creation" into nyc-dev am: 6437dac3d9 
am: 3b981d026c

* commit '3b981d026c87caa9ac0958a9c30b6d1566e12543':
  Less lazy child FragmentManager creation

Change-Id: I7e6adf142e707027e41346c0d3f847a8a4d599d3
 2016-05-11 22:00:59 +00:00
Adam Powell
2106f3e935 Merge "Less lazy child FragmentManager creation" into nyc-dev am: 6437dac3d9 
am: 8dd12a52cc

* commit '8dd12a52cc422bd0f4894cac7d23bcb3cba19037':
  Less lazy child FragmentManager creation

Change-Id: I67296b51104728619a9be0b589fb17e5d25dcd66
 2016-05-11 22:00:25 +00:00
sergeyv
db607a6cde Merge "Draw textShadow always first." into nyc-dev 
am: 45d6e79565

* commit '45d6e7956544051c06a228755b7fd7c179bcdbfe':
  Draw textShadow always first.

Change-Id: Ic7b600ef444bf58d37203266f3faede21cd50711
 2016-05-11 21:59:52 +00:00
sergeyv
ac26a7c427 Merge "Draw textShadow always first." into nyc-dev 
am: 45d6e79565

* commit '45d6e7956544051c06a228755b7fd7c179bcdbfe':
  Draw textShadow always first.

Change-Id: I78d809e2acb40a49c17189d41921eec6496c380a
 2016-05-11 21:59:44 +00:00
Chong Zhang
e9f5d365bb Merge "Deliver new activity options after the activity is made visible" into nyc-dev 2016-05-11 21:51:05 +00:00
Android Build Merger (Role)
a1188ca78e Merge "Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev am: bc5446cba5 am: e706e6cc82" into nyc-mr1-dev-plus-aosp 2016-05-11 21:43:58 +00:00
Android Build Merger (Role)
1bf185d8db Merge "Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 am: 2c8014b032 am: f1cf8595bc am: 090692e62d" into nyc-mr1-dev-plus-aosp 2016-05-11 21:43:49 +00:00
Wale Ogunwale
c3da0ab874 Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev am: bc5446cba5 
am: e706e6cc82

* commit 'e706e6cc822133eb968ec304b97af0e218fc6b8c':
  Crop wallpaper windows to their current target stack bounds

Change-Id: I20a9f09dbb44f33f8c269a1b5310df7994c601b0
 2016-05-11 21:43:14 +00:00
Kevin Hufnagle
1f954a4418 Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 am: 2c8014b032 am: f1cf8595bc 
am: 090692e62d

* commit '090692e62da4e56baa759e7e8c19a574cac7ad7c':

Change-Id: I440155f1bdc780360b22a17ed46937a52051a21c
 2016-05-11 21:41:53 +00:00
Adam Powell
3b981d026c Merge "Less lazy child FragmentManager creation" into nyc-dev 
am: 6437dac3d9

* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
  Less lazy child FragmentManager creation

Change-Id: Ic5917acbe07f67a577ce693680c132d07519d34a
 2016-05-11 21:41:50 +00:00
Adam Powell
8dd12a52cc Merge "Less lazy child FragmentManager creation" into nyc-dev 
am: 6437dac3d9

* commit '6437dac3d929297450d1ac937800eb35a5e51ef2':
  Less lazy child FragmentManager creation

Change-Id: I64e044e21b86f3015ab251780952c5b157b2b1e9
 2016-05-11 21:41:43 +00:00
Chong Zhang
371c44222f Deliver new activity options after the activity is made visible 
The return options need to be sent in makeVisibleIfNeeded() (where app
is made visible from invisible), in addition to handleAlreadyVisible().
We can't rely on getting a second ensureActivitiesVisibleLocked to
send the activity options.

bug: 28610520
Change-Id: I38a4fd4624daecddfe9ea49c87753b04b154bb82
 2016-05-11 14:40:19 -07:00
Wale Ogunwale
f36dda8de9 Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev am: bc5446cba5 
am: 28f247c19a

* commit '28f247c19a1b15f313887d9482b18e8a365c0aa8':
  Crop wallpaper windows to their current target stack bounds

Change-Id: I7eed37a1ab93a8be1bac4af7d7df20578ac14c49
 2016-05-11 21:36:05 +00:00
Sergei Vasilinetc
45d6e79565 Merge "Draw textShadow always first." into nyc-dev 2016-05-11 21:34:19 +00:00
Adam Powell
6437dac3d9 Merge "Less lazy child FragmentManager creation" into nyc-dev 2016-05-11 21:32:57 +00:00
Wale Ogunwale
28f247c19a Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev 
am: bc5446cba5

* commit 'bc5446cba502eeda3b4e0e81f512e673b6b55caa':
  Crop wallpaper windows to their current target stack bounds

Change-Id: Ia2b1dc04ff090666b88f06547af3a40c6df37d19
 2016-05-11 21:29:07 +00:00
Wale Ogunwale
e706e6cc82 Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev 
am: bc5446cba5

* commit 'bc5446cba502eeda3b4e0e81f512e673b6b55caa':
  Crop wallpaper windows to their current target stack bounds

Change-Id: Iab419b8c11f1d8218a2c1593119f76d8f3d2f219
 2016-05-11 21:28:33 +00:00
Kevin Hufnagle
090692e62d Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 am: 2c8014b032 
am: f1cf8595bc

* commit 'f1cf8595bcaa4e6d28d1d246a225888df2e8df84':
  docs: Removed "Launcher Shortcuts" section.

Change-Id: I4a6b6a0a1f38ff4dceb623e9e057d95db22b290c
 2016-05-11 21:28:03 +00:00
Kevin Hufnagle
455c2ca681 Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 am: 2c8014b032 am: f1cf8595bc 
am: 504cf41b3d

* commit '504cf41b3d1d0ae096b5543d5c27f6992c55e9e9':
  docs: Removed "Launcher Shortcuts" section.

Change-Id: I21c352d17031ba128a68d799d4002483fd5ce051
 2016-05-11 21:26:55 +00:00
Kevin Hufnagle
504cf41b3d Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 am: 2c8014b032 
am: f1cf8595bc

* commit 'f1cf8595bcaa4e6d28d1d246a225888df2e8df84':
  docs: Removed "Launcher Shortcuts" section.

Change-Id: I535df10d68bff43fba713663cd197b9da5cfced9
 2016-05-11 21:19:30 +00:00
TreeHugger Robot
bc5446cba5 Merge "Crop wallpaper windows to their current target stack bounds" into nyc-dev 2016-05-11 21:15:43 +00:00
Dirk Dougherty
fa083d37df Merge "Add navtree for wearable support lib." into mnc-mr-docs am: 1e0d1c67b4 am: 3728c5b99e am: ddf5082e2e am: d6ea95a4ba 
am: b2e2ed4670

* commit 'b2e2ed4670acf23b480306fb3bcf995d4d24d5af':

Change-Id: I81d487d147cf1dd8d3b6d5dad4d7284ed5b65bb3
 2016-05-11 21:15:03 +00:00
Kevin Hufnagle
f1cf8595bc Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs am: 4d004b5780 
am: 2c8014b032

* commit '2c8014b0321d9220476fc3cf9f74dd9f3054f263':
  docs: Removed "Launcher Shortcuts" section.

Change-Id: I72a421788ebf13da73a31ada3c676516038cfcad
 2016-05-11 21:13:14 +00:00
Dirk Dougherty
2b2fa72169 Add updated Test Support lib docs to reference. am: debd2a7d41 am: 59df5b8029 am: af5c50e1fa am: dff9dcd4bf 
am: 357cb5f216

* commit '357cb5f21614e4c3451abfd9826be662fb5fe0f5':

Change-Id: I7751bcce11c328f67c095cbf6c19a70daa759251
 2016-05-11 21:12:15 +00:00
Kevin Hufnagle
2c8014b032 Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs 
am: 4d004b5780

* commit '4d004b5780150bc9ba94459bc4d1a2bce5fb6202':
  docs: Removed "Launcher Shortcuts" section.

Change-Id: I86317684cb18bc0ab9bda6ff34ccf222d7e5b4b8
 2016-05-11 21:07:12 +00:00
Dirk Dougherty
31d3fdd7df Merge "Add navtree for wearable support lib." into mnc-mr-docs am: 1e0d1c67b4 am: 3728c5b99e am: ddf5082e2e am: d6ea95a4ba 
am: 64b13555fe

* commit '64b13555fee14434e6fa67ce544cafc383d0b0f2':
  Add navtree for wearable support lib.

Change-Id: I3ace66ea082bd5dbd534da0af4df50d191488aac
 2016-05-11 20:50:38 +00:00
Dirk Dougherty
95be00f1e7 Add updated Test Support lib docs to reference. am: debd2a7d41 am: 59df5b8029 am: af5c50e1fa am: dff9dcd4bf 
am: 2b16dcebfe

* commit '2b16dcebfe338d1880e2aba7575b42f845d20bbd':
  Add updated Test Support lib docs to reference.

Change-Id: I57d1b3e6e7a38efde43706d742238b1d7e217fa9
 2016-05-11 20:47:27 +00:00
David Friedman
4d004b5780 Merge "docs: Removed "Launcher Shortcuts" section." into mnc-io-docs 2016-05-11 20:46:05 +00:00
Adam Powell
467cc6f0e1 Less lazy child FragmentManager creation 
Framework edition

Fix a bug where child FragmentManagers moving too lazily into the
CREATED state and beyond caused child fragments to not be
attached/created when expected.

Bug 25019275

Change-Id: I04ff0d3bcb693178a6ee3057da591392defdbcf8
 2016-05-11 13:45:33 -07:00
Dirk Dougherty
64b13555fe Merge "Add navtree for wearable support lib." into mnc-mr-docs am: 1e0d1c67b4 am: 3728c5b99e am: ddf5082e2e 
am: d6ea95a4ba

* commit 'd6ea95a4ba3dc4f8cb5608d4b2ce3e07b4f8066c':
  Add navtree for wearable support lib.

Change-Id: I9ac263bdfde1ea9edfb9ad0c3e56aaf9dcee6222
 2016-05-11 20:31:19 +00:00
Dirk Dougherty
b2e2ed4670 Merge "Add navtree for wearable support lib." into mnc-mr-docs am: 1e0d1c67b4 am: 3728c5b99e am: ddf5082e2e 
am: d6ea95a4ba

* commit 'd6ea95a4ba3dc4f8cb5608d4b2ce3e07b4f8066c':
  Add navtree for wearable support lib.

Change-Id: I12bc4150d691588bf4a48dc6fc5ce89c7d444950
 2016-05-11 20:31:15 +00:00
Dirk Dougherty
2b16dcebfe Add updated Test Support lib docs to reference. am: debd2a7d41 am: 59df5b8029 am: af5c50e1fa 
am: dff9dcd4bf

* commit 'dff9dcd4bf7879cf53026ce4402f591c3ecc9d1c':
  Add updated Test Support lib docs to reference.

Change-Id: Ifb035aa7b973cda8c44e52a3e474112d77dd7b7f
 2016-05-11 20:28:56 +00:00
Dirk Dougherty
357cb5f216 Add updated Test Support lib docs to reference. am: debd2a7d41 am: 59df5b8029 am: af5c50e1fa 
am: dff9dcd4bf

* commit 'dff9dcd4bf7879cf53026ce4402f591c3ecc9d1c':
  Add updated Test Support lib docs to reference.

Change-Id: I5139c32aa25f65ae3dd93dc9fb28c7ca2c876ac6
 2016-05-11 20:28:47 +00:00
Dirk Dougherty
d6ea95a4ba Merge "Add navtree for wearable support lib." into mnc-mr-docs am: 1e0d1c67b4 am: 3728c5b99e 
am: ddf5082e2e

* commit 'ddf5082e2e8bb09dff236e78a03f559161f14a23':
  Add navtree for wearable support lib.

Change-Id: I34a50e19623a9e78bb0a2ed3b2207cd1527f5153
 2016-05-11 20:12:36 +00:00