Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,358 Commits 3 Branches 0 Tags
b0f63057fc5eba6eb98c337ea1d5df3eaab09f49
Commit Graph

59366 Commits

Author SHA1 Message Date
Selim Cinek
b0f63057fc Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 0aef73a252 
am: c93f4b6707

* commit 'c93f4b67076b683c463ab949d6087b41303bc06c':
  Fixed a bug where notification header could become empty

Change-Id: Ifb5e38f663973c62211249edcccdd0d72c754f1c
 2016-04-22 05:46:40 +00:00
Selim Cinek
0aef73a252 Merge "Fixed a bug where notification header could become empty" into nyc-dev 
am: 57e4a67be1

* commit '57e4a67be13eede636608f789d1b88d0889683ec':
  Fixed a bug where notification header could become empty

Change-Id: I5c22f22e67ed60ae441adccf852fc3850c400ad5
 2016-04-22 05:42:07 +00:00
Selim Cinek
57e4a67be1 Merge "Fixed a bug where notification header could become empty" into nyc-dev 2016-04-22 05:33:33 +00:00
Selim Cinek
65080a64df Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306 am: ba26bf8a47 
am: 5e2a3e5872

* commit '5e2a3e5872e8439ad836b5b281e6393ecefb50f4':
  Changed the name of chronometer countdown

Change-Id: Ibce68e45c56e90ee66b7a7d2fbfc0350178885fa
 2016-04-22 03:47:25 +00:00
Selim Cinek
5e2a3e5872 Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306 
am: ba26bf8a47

* commit 'ba26bf8a471275520c8a6d97dccd19e6e6993388':
  Changed the name of chronometer countdown

Change-Id: I8c4970cfd2f0f2c8c56647737e1993de65dc1ec7
 2016-04-22 03:45:09 +00:00
Selim Cinek
540aa3c8a0 Merge "Changed the name of chronometer countdown" into nyc-dev 
am: 8f32cd4306

* commit '8f32cd4306a201c2167c20fc636fe613f1fabd4c':
  Changed the name of chronometer countdown

Change-Id: I2e7040b43c2f46dfc8159d98862e865343df221d
 2016-04-22 03:40:33 +00:00
Selim Cinek
8f32cd4306 Merge "Changed the name of chronometer countdown" into nyc-dev 2016-04-22 03:21:52 +00:00
Christopher Tate
055e661706 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev am: 0a7ec886c3 am: 3e9f59e862 
am: 1fb59e587f

* commit '1fb59e587f95e0235ec7c0827a1d2e163bc8bd44':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: I0e0d4b03f2a15b12e9bcfc6906e949137e3a380c
 2016-04-22 00:55:48 +00:00
Christopher Tate
3e9f59e862 Merge "Don\'t worry about an extra weak indirection with callback alarms" into nyc-dev 
am: 0a7ec886c3

* commit '0a7ec886c35107c1f8d2d1ff3977ac5dd91fddd1':
  Don't worry about an extra weak indirection with callback alarms

Change-Id: Ifd44a119263b68ff6b67679931c579dcef622d0e
 2016-04-22 00:50:56 +00:00
Chris Tate
0a7ec886c3 Merge "Don't worry about an extra weak indirection with callback alarms" into nyc-dev 2016-04-22 00:40:44 +00:00
Selim Cinek
2490b38795 Merge "Switched the notification time to relative time" into nyc-dev am: 037235d83e am: 832775b7f3 
am: 22ac656218

* commit '22ac65621885412c1e90594644b98281f36b64e7':
  Switched the notification time to relative time

Change-Id: Ib4a88c9e7b47bc5f9c586cc49a6eb97ad98fe642
 2016-04-22 00:23:54 +00:00
Selim Cinek
832775b7f3 Merge "Switched the notification time to relative time" into nyc-dev 
am: 037235d83e

* commit '037235d83edcc78aab8798a0b221b6f14d9e15f3':
  Switched the notification time to relative time

Change-Id: I599b7e0c7e4576e04f9409b464fc7b9a3b96c72c
 2016-04-22 00:12:16 +00:00
TreeHugger Robot
037235d83e Merge "Switched the notification time to relative time" into nyc-dev 2016-04-21 23:47:23 +00:00
Adam Powell
3cddcd63d0 Merge "Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6 am: e362a65921" into nyc-mr1-dev-plus-aosp 
am: 47074ca3ce

* commit '47074ca3cee75fa176055f884faf51b29301d191':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I723dbab01c5fbb93d4d08382e5cdfbb31b4ac86e
 2016-04-21 23:35:06 +00:00
John Reck
be31f33405 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa am: bf4e2f742c 
am: eaec808ac5

* commit 'eaec808ac5a3cfc82b3d954f00949760b85986ac':
  Fix flag value collision

Change-Id: Ia999f06d58d128e3ab01109ba9a7237957ce4321
 2016-04-21 23:34:58 +00:00
Adam Powell
92145a1669 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev am: ee4ee262c6 
am: e362a65921

* commit 'e362a6592134c5684381028f3fdccee6c8b3418a':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I49d915efafe438c62ae3d29c4826799494d7e4cc
 2016-04-21 23:32:35 +00:00
Tim Murray
eaec808ac5 Merge "Fix flag value collision" into nyc-dev am: e5cebf7aaa 
am: bf4e2f742c

* commit 'bf4e2f742c81c136e4f4a7019026a09dce8a3d98':
  Fix flag value collision

Change-Id: I45d049b899c2171957f8c005267928c07422a411
 2016-04-21 23:32:32 +00:00
Adam Powell
bc27c869b1 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev 
am: ee4ee262c6

* commit 'ee4ee262c674cf0a20cf294ecfe4b8736cf6c983':
  Move child FragmentManager shutdown for retained fragments

Change-Id: I4e946a45c375c6af680679fc1415f9ff0ff0f5d1
 2016-04-21 23:30:14 +00:00
John Reck
59311fb7c9 Merge "Fix flag value collision" into nyc-dev 
am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I7efb08917bbab1c3594b23fd256ba6fa2e68ba6e
 2016-04-21 23:30:10 +00:00
Adam Powell
ee4ee262c6 Merge "Move child FragmentManager shutdown for retained fragments" into nyc-dev 2016-04-21 23:05:03 +00:00
Tim Murray
e5cebf7aaa Merge "Fix flag value collision" into nyc-dev 2016-04-21 22:59:42 +00:00
John Reck
60e885f672 Fix flag value collision 
Bug: 28314544
Change-Id: If73c1e8fd0e7b313bccbeffa172bdc3ab9496a43
 2016-04-21 15:40:45 -07:00
Selim Cinek
b85f36fd48 Fixed a bug where notification header could become empty 
Also fixed a few more issues with the header util that could
lead to wrong states.

Change-Id: I95c3479f5d9e5221ee9e91120271e7957b887607
Fixes: 28295743
 2016-04-21 15:07:10 -07:00
Selim Cinek
c3b752e712 Changed the name of chronometer countdown 
Change-Id: Ie0339205b26f2dff40e0c19760750a0ce6aaf7da
Fixes: 28295825
 2016-04-21 15:07:08 -07:00
Selim Cinek
36d570863a Switched the notification time to relative time 
The time is now displayed in a relative manner instead
of absolute.

Change-Id: Idcc4411ed07991b6e176c4890a0d804394d8598a
Fixes: 27435284
 2016-04-21 15:07:06 -07:00
Christopher Tate
d0cca79f3c Don't worry about an extra weak indirection with callback alarms 
Bug 27995384

Change-Id: Ie9cf3e05dca4af7085b479fb65d4cf45ee0239ba
 2016-04-21 15:05:34 -07:00
Vladislav Kaznacheev
4465add3e1 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8 am: 45b1e14468 
am: 0ee7fecd43

* commit '0ee7fecd437b4ba4676985e072c940a819d46114':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Id978e6f65b915955d1caff4825d89373f248d168
 2016-04-21 21:48:10 +00:00
Hyunyoung Song
18956a3d6f Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev am: 44157a4abf am: 84e85f2e56 
am: 035b1d1c27

* commit '035b1d1c27a85ccb83c425e0e76458ee5c9db42c':
  Fix broken build due to @RemotableViewMethod

Change-Id: If70a4a63991756b7d8bec8236be09caa7705882e
 2016-04-21 21:48:07 +00:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
 2016-04-21 21:43:08 +00:00
Hyunyoung Song
84e85f2e56 Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev 
am: 44157a4abf

* commit '44157a4abf36250f259eca4cdaa346be15d47738':
  Fix broken build due to @RemotableViewMethod

Change-Id: Iad3e7a73952046d00e533ddb0ccabe28d3d646c6
 2016-04-21 21:43:04 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Hyunyoung Song
44157a4abf Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev 2016-04-21 21:32:38 +00:00
Alan Viverette
ed276c145c Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d am: c1a3af4546 
am: 06f931e8ea

* commit '06f931e8eae92cbfb24983502d9cdf41f1284dad':
  API review feedback for ProgressBar

Change-Id: I8a38db908a3b01b33787d4f9e2c6483b3c325ef6
 2016-04-21 21:31:35 +00:00
Alan Viverette
06f931e8ea Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d 
am: c1a3af4546

* commit 'c1a3af4546782846ef94e4ffd960133107707a88':
  API review feedback for ProgressBar

Change-Id: I0bdf04c9e8a276479976d8647d208a7d95a4f506
 2016-04-21 21:29:22 +00:00
Alan Viverette
c27d18d681 Merge "API review feedback for ProgressBar" into nyc-dev 
am: 5500bb1d6d

* commit '5500bb1d6d5d5c49f7bb5d81b48a707f1ade75ab':
  API review feedback for ProgressBar

Change-Id: If6e1d8d9211b86030d8a678b6030df4cc50c9e77
 2016-04-21 21:27:06 +00:00
Hyunyoung Song
3a93f0ff37 Fix broken build due to @RemotableViewMethod 
Change-Id: I63c6cb4fa68df114220efb2f263115e773e25f5d
 2016-04-21 14:26:54 -07:00
Alan Viverette
5500bb1d6d Merge "API review feedback for ProgressBar" into nyc-dev 2016-04-21 21:21:56 +00:00
Hyunyoung Song
e4aabe62ff Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4 am: b99a507ec0 
am: 6d9221ed9b

* commit '6d9221ed9bd4413d9c6bf43ac56c2849e34676bd':
  add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I6c2721de82645f49b4fec6f99902b98a81d4ebe6
 2016-04-21 21:11:15 +00:00
Hyunyoung Song
b99a507ec0 Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev 
am: 22d91b0eb4

* commit '22d91b0eb40137e6236d7af5d2857df97648d15b':
  add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I7d8f610e543ad1ef9937b342c04feb75774c0b23
 2016-04-21 21:06:24 +00:00
Hyunyoung Song
22d91b0eb4 Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev 2016-04-21 21:04:25 +00:00
Hyunyoung Song
7b77e0c765 add @RemotableViewMethod to TextView#setEnabled 
b/28304068

Change-Id: Ia5464030a65c87dacdd75e5be331da017d7ef593
 2016-04-21 13:41:56 -07:00
Robert Carr
001ccdc98f Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: ff54c9eeb2 
am: e42b3f0586

* commit 'e42b3f0586b5055eeb1e77c4b5d52001fcff9c90':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a
 2016-04-21 20:08:18 +00:00
Rob Carr
e42b3f0586 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534
 2016-04-21 20:03:34 +00:00
Robert Carr
674bedee2e Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1
 2016-04-21 20:01:15 +00:00
Rob Carr
37696cccd8 Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev 2016-04-21 19:52:02 +00:00
Kirill Grouchnikov
c17c387603 Merge "@TestApi method to get display value for current selection" 2016-04-21 19:25:10 +00:00
Adam Powell
a9bab98d70 Move child FragmentManager shutdown for retained fragments 
Some apps out there do some creative things in terms of calling their
own onDetach methods from elsewhere. Perform the child FragmentManager
shutdown for retained fragments in a package-level perform method
instead of in onDetach itself.

Also mark all existing fragment methods with @CallSuper.

Bug 28293847

Change-Id: I343b610f8d427fe5cabd523a78fbf0e6f3b34c57
 2016-04-21 11:04:41 -07:00
Yohei Yukawa
028333feaf Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b am: 1f79c0fea1 
am: 1241d67eff

* commit '1241d67eff7cf0fd20be4fca7c1a63c3679c541c':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I811104dab27ac95c401a88d5ef8b82e9a45eb9f2
 2016-04-21 17:20:55 +00:00
Yohei Yukawa
1f79c0fea1 Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09
 2016-04-21 17:16:19 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00