Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,038 Commits 3 Branches 0 Tags
7564159f75c3a17bf2cf75abd03804531579110a
Commit Graph

245038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
7564159f75 Merge "QS tile lifecycle management" into nyc-dev am: e59bbb0 
am: 88edcf7

* commit '88edcf7ed3aba312e516c227b52371e9fe84c5b8':

Change-Id: I91568349ec1005c2df12deab741025a971f57003
 2016-04-20 21:40:28 +00:00
Yang Ni
aca4079cd4 Merge "Made Element accessors thread-safe" into nyc-dev am: c74d2a8 
am: 044d92c

* commit '044d92c5c50685ad07cd56eac79356982286b17b':

Change-Id: I1de36c2261cd41959aef7ceab4fcff75b353bbeb
 2016-04-20 21:40:06 +00:00
Phil Weaver
d202c8c04a Merge "Clear calling identity when binding a11y services" into nyc-dev am: b72c306 
am: 7e0e9dd

* commit '7e0e9dd586202f059a245dfd3f6474e870e962f4':

Change-Id: I4680a924627fdcc22ca7b362b744e4a1daa4edeb
 2016-04-20 21:39:44 +00:00
Shubham Ajmera
320276c8d9 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev am: f3d5a4d 
am: e2135ff

* commit 'e2135ff6d3a894ebe71c44da5f523835fbf6001f':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I6d0c99029ea910b4f4c81e3ec15bea44f194e1e6
 2016-04-20 21:17:53 +00:00
Chong Zhang
060eeca69b Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev am: 3966fb9 
am: 35e1368

* commit '35e13681e9c175f655596dc8a240d6b19be5ed71':
  Fix IME adjust when stack focus changes while IME is visible

Change-Id: I9b72a9f36e43d0fd708117b98f8373590c813e7d
 2016-04-20 21:17:43 +00:00
Fan Zhang
242b4c6a31 Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 
am: b6060a3

* commit 'b6060a3fbc9b1144aa515d17c67bb68eefb83893':
  Allow fragments set their own header view below actionbar.

Change-Id: I7958885f68dd6c1de54fb86fe6838ffcea6b6c45
 2016-04-20 21:17:30 +00:00
Ruchi Kandoi
a78d8d303e Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 
am: 75da7b4

* commit '75da7b4ad041586d1a7a086467a6e6a76516e15f':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: Id029aa2f10e4d278c385487739978075607f29a1
 2016-04-20 21:17:12 +00:00
Ruben Brunk
04121ec122 Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702 
am: 5356c87

* commit '5356c871ac1d8ce2ee0de79e24c450d6907e70bb':
  Add settings for altering VR display behavior.

Change-Id: I35e79e9ba7517d05a0737e4974286a6a341c9640
 2016-04-20 21:16:51 +00:00
Daniel Estrada Alva
a916bd9639 Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9 
am: be80c9b

* commit 'be80c9bb5a028acb1a333efa07b0dcf6aff34c2c':
  Add support for multiple callback registration in.

Change-Id: I183cb869aefe6aaa06ac2079cf41c981ac8fe81c
 2016-04-20 21:16:37 +00:00
Dongwon Kang
6bcb65d697 Merge "TIF: Do not build input list for background user" into nyc-dev am: 4a6bd4b 
am: 2a5f69b

* commit '2a5f69b8c84d269be2f2ca71cdb5164308d4f967':
  TIF: Do not build input list for background user

Change-Id: Iaafbadb6d088ed072241c78b82c4aeb84bc8562d
 2016-04-20 21:16:28 +00:00
Julia Reynolds
c3777caa71 Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412 
am: 87ea43b

* commit '87ea43b890ee6e207460763b6bf104048bf58ad3':
  Align radio buttons with app icon, change text color.

Change-Id: Ibfbab9183aa1cbffa6addb0a1c2b6b8807c4299f
 2016-04-20 21:16:18 +00:00
Julia Reynolds
515aa1def2 Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f 
am: f825573

* commit 'f825573e014cd4ed493410d97b6d6294dd669ad3':
  Animate volume dialog expansion/contraction.

Change-Id: I723d5f05b08519e2abb51b915ea638731ae42820
 2016-04-20 21:16:06 +00:00
TreeHugger Robot
80d5aef051 Merge "Only try to add details to zip once." into nyc-dev am: 0304688 
am: 01c93c4

* commit '01c93c476ab5ed299e99eaeed3ce962a9cd6f1fe':
  Only try to add details to zip once.

Change-Id: I6df023671a41d3bc7762d74c1b3b875332b56483
 2016-04-20 21:15:54 +00:00
Mitchell Wills
115cb0b39e Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c am: de629c7 
am: ef2bf66

* commit 'ef2bf66598285bf8612f7fd0d9bf977fe2dcd14d':
  Update scan and last network info in the WorkThread

Change-Id: If2fe59775e0c2e8ea0592b1c561ef50346e382bf
 2016-04-20 21:15:41 +00:00
Andreas Gampe
798372384e Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072 
am: 6ce2774

* commit '6ce27741799f0059e343cde5e0fbef9073c60ee8':
  Frameworks/base: Add holder to BaseBundle

Change-Id: Ia4053ed3e376a08dbe8f1273d86c3ebdb2cca388
 2016-04-20 21:15:26 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 
am: 254f1b8

* commit '254f1b8a43480749b7061129289d34bc15d345a5':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
 2016-04-20 21:15:11 +00:00
Rob Carr
4450987a23 Merge "When restacking IM windows preserve relative order." into nyc-dev am: db973df 
am: ab344b8

* commit 'ab344b84e2a96707720d19feb642e57b4b827976':
  When restacking IM windows preserve relative order.

Change-Id: Ie0ef57d3a66036ad850b7016ecad345d2d8886c2
 2016-04-20 21:14:56 +00:00
Rob Carr
ae3539f055 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a 
am: bf2a2fa

* commit 'bf2a2fafaf7659352dbc36de507e52dceceecaad':
  Respect WRAP_CONTENT when resolving drop down position.

Change-Id: I82ab0dcef53f34ba5275826e47a724842bd6cdd8
 2016-04-20 21:14:41 +00:00
Yi Kong
d0fd8d6071 Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev am: 8c205b5 
am: b752ef7

* commit 'b752ef7725a5e0ae8aafb4d6f3dbbce871de5711':
  Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Change-Id: I3544f60ac30c63cbdd98b88cccacd378cf773050
 2016-04-20 21:14:16 +00:00
Sudheer Shanka
8fe7239c1c Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev am: df9ecfc 
am: ecbf20f

* commit 'ecbf20f31da3757ff9288880733256479aa778f4':
  Add restrictedSwitchSummary attribute to restricted switch preferences.

Change-Id: Ic85d6a9233e3abae92cac72a05d6527dfb0e7efe
 2016-04-20 21:13:18 +00:00
Jae Seo
d985cc1424 Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev am: 801d416 
am: ee1134a

* commit 'ee1134a89f836f9a30067a9f4fa04bc555c26f49':
  ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail

Change-Id: I74bad33e94eedb9ae5fb57958a11bcfc354c8e41
 2016-04-20 21:12:53 +00:00
Sudheer Shanka
5f75618aed Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev am: 205d10b 
am: f6f61fc

* commit 'f6f61fc891cb0fcff904e5b9da250c59d8aa25a3':
  Fix additional summary of RestrictedSwitchPreference.

Change-Id: Icf194cff988090ce599ee49f8c6adf0b007d8572
 2016-04-20 21:12:32 +00:00
Jason Monk
2ea96bcdd7 Merge "Daydream -> screen saver" into nyc-dev am: eeaaf26 
am: dbc5727

* commit 'dbc5727bcdfec0df685095a992edeb6895901129':
  Daydream -> screen saver

Change-Id: I447185a7319f9f2568ca5ee31ee624bd6450b2b9
 2016-04-20 21:12:10 +00:00
TreeHugger Robot
9acf1516eb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba 
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
 2016-04-20 21:11:50 +00:00
Jason Monk
d25aa0697f Merge "Allow QS details to scroll when the screen is really small" into nyc-dev am: 10ea519 
am: 96282fb

* commit '96282fb962313f7b10d2811903d5a9e50a9549c5':
  Allow QS details to scroll when the screen is really small

Change-Id: Ia4c8a2f21b8cdd6e49bae06229bbaf1851261379
 2016-04-20 21:11:30 +00:00
Vladislav Kaznacheev
28ad3dce81 Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev am: c8df6aa 
am: 64577d6

* commit '64577d61f57d12a4cd7010b25c21d641d95527a6':
  Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window

Change-Id: I9a079d761be6e8eb570fd268c13d28b553d16d57
 2016-04-20 21:11:06 +00:00
Jason Monk
d34b7779a0 Merge "QS tile lifecycle management" into nyc-dev am: e59bbb0 
am: 518eb44

* commit '518eb44104efa360d7d7a8718d0eaaa3b8a07514':
  QS tile lifecycle management

Change-Id: If72193fd330be19438de969248e045c00be40ddc
 2016-04-20 21:09:54 +00:00
Yang Ni
0e7b602712 Merge "Made Element accessors thread-safe" into nyc-dev am: c74d2a8 
am: 87ae739

* commit '87ae73951fa9d7cd9d1a71646600dc104b19fa70':
  Made Element accessors thread-safe

Change-Id: I0eaf67c1e20bbce35357ef025ce346435b93f66e
 2016-04-20 21:09:17 +00:00
Jason Monk
88edcf7ed3 Merge "QS tile lifecycle management" into nyc-dev 
am: e59bbb0

* commit 'e59bbb0899e17710e9380b704141b100ddc2faa0':
  QS tile lifecycle management

Change-Id: I44eb2611b3c66c547c2f67c48278a01b0fb24652
 2016-04-20 21:09:05 +00:00
Phil Weaver
88dbe09eae Merge "Clear calling identity when binding a11y services" into nyc-dev am: b72c306 
am: e7da35f

* commit 'e7da35f5a7484719aaa170e38120b540bcda7655':
  Clear calling identity when binding a11y services

Change-Id: Ib1b3839a2ced07c7c2900b4c741c16fb2e18871e
 2016-04-20 21:08:55 +00:00
Yang Ni
044d92c5c5 Merge "Made Element accessors thread-safe" into nyc-dev 
am: c74d2a8

* commit 'c74d2a8b8795bb0679225afcdd4d446c29440d85':
  Made Element accessors thread-safe

Change-Id: I98605e81d6384b2261b7f09885c7d882f7005a04
 2016-04-20 21:08:50 +00:00
Phil Weaver
7e0e9dd586 Merge "Clear calling identity when binding a11y services" into nyc-dev 
am: b72c306

* commit 'b72c30653dc9652d9c6beba979e5ea194c1a4638':
  Clear calling identity when binding a11y services

Change-Id: I045bca4d88cdf22e84afd80534ddcb63a355302f
 2016-04-20 21:08:35 +00:00
Shubham Ajmera
e2135ff6d3 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev 
am: f3d5a4d

* commit 'f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I296d2c4a5700ac7fb882d2b02d434796cd6527df
 2016-04-20 21:00:49 +00:00
Chong Zhang
35e13681e9 Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev 
am: 3966fb9

* commit '3966fb942c7a9445a8cc94aeafc445778c2311b4':
  Fix IME adjust when stack focus changes while IME is visible

Change-Id: I53a0d8101b13443c30182909d02d952fce2fede6
 2016-04-20 21:00:46 +00:00
Shubham Ajmera
f3d5a4dd60 Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev 2016-04-20 20:52:58 +00:00
Chong Zhang
3966fb942c Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev 2016-04-20 20:52:08 +00:00
Fan Zhang
b6060a3fbc Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev 2016-04-20 20:50:17 +00:00
Ruchi Kandoi
75da7b4ad0 Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev 
am: a645c97

* commit 'a645c9753ff004e616a6df4a15c9d2e999508d91':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: I8d3803ce5530ae84a876d66690b3fdb907ebc96b
 2016-04-20 20:42:25 +00:00
Ruchi Kandoi
a645c9753f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev 2016-04-20 20:35:21 +00:00
Ruben Brunk
5356c871ac Merge "Add settings for altering VR display behavior." into nyc-dev 
am: 6ada702

* commit '6ada702993227233fd362e98de93cc9e798dc75d':
  Add settings for altering VR display behavior.

Change-Id: I1816516b1d9c459c0d7bef77c72d9173da7fc3c9
 2016-04-20 19:57:37 +00:00
Ruben Brunk
6ada702993 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:51 +00:00
Yi Kong
5cf7d6f327 Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce 
am: 93932ff

* commit '93932ff30df2544ecd31343c317617c4cf593241':
  Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce

Change-Id: Icf8d9e9aa8f74dbd680ba799c337a1ec536da5db
 2016-04-20 19:50:53 +00:00
Yi Kong
6440bba191 Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce 
Bug: 27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
(cherry picked from commit d7c695d25b)
(cherry picked from commit a69302e9e2)
(cherry picked from commit 30472f7488)
(cherry picked from commit 93932ff30d)
 2016-04-20 19:47:31 +00:00
Yi Kong
93932ff30d Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce 
Bug: 27704598
Change-Id: I5cb900c7b48bc7b48ed0ea1110ff834e1d316de7
(cherry picked from commit d7c695d25b)
(cherry picked from commit a69302e9e2)
(cherry picked from commit 30472f7488)
 2016-04-20 19:40:44 +00:00
destradaa
be80c9bb5a Merge "Add support for multiple callback registration in." into nyc-dev 
am: fdb26b9

* commit 'fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
  Add support for multiple callback registration in.

Change-Id: Ifffd31cdafdde3fe1f9b7118cab1485486531b33
 2016-04-20 19:30:51 +00:00
Dongwon Kang
2a5f69b8c8 Merge "TIF: Do not build input list for background user" into nyc-dev 
am: 4a6bd4b

* commit '4a6bd4b48fe309f50a3878d85104be6fbf244d50':
  TIF: Do not build input list for background user

Change-Id: Ibd788b4903e306c1b18a093183880001dbf14475
 2016-04-20 19:24:24 +00:00
Daniel Estrada Alva
fdb26b90cb Merge "Add support for multiple callback registration in." into nyc-dev 2016-04-20 19:22:10 +00:00
Dongwon Kang
4a6bd4b48f Merge "TIF: Do not build input list for background user" into nyc-dev 2016-04-20 19:19:34 +00:00
Julia Reynolds
87ea43b890 Merge "Align radio buttons with app icon, change text color." into nyc-dev 
am: 1ff2412

* commit '1ff2412cc49424ffe9594538618d063c1e0a6951':
  Align radio buttons with app icon, change text color.

Change-Id: I6b3cdbd36ee669a5fa32417cee14837258f7f6b8
 2016-04-20 19:14:36 +00:00
Julia Reynolds
f825573e01 Merge "Animate volume dialog expansion/contraction." into nyc-dev 
am: e86ac2f

* commit 'e86ac2f0da9ec71e9d990291053eec8f352af52d':
  Animate volume dialog expansion/contraction.

Change-Id: I7c08343c0400ca34031b5908adfee71f80adf5c9
 2016-04-20 19:14:35 +00:00