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

65105 Commits

Author SHA1 Message Date
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
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
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
af16330e37 Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d am: d1fb914324 
am: 0a80cd5cc0

* commit '0a80cd5cc075e4b4bbd8a3557234414b08bf21a7':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: Icc50140af2be266f86586b3b78f1c08a5793030d
 2016-04-21 21:31:31 +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
0a80cd5cc0 Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d 
am: d1fb914324

* commit 'd1fb9143244dcb46b28a0edbae88f8f5815d31bf':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f
 2016-04-21 21:29:18 +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
Alan Viverette
37ab66ab37 Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev 
am: e84393674d

* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee
 2016-04-21 21:27:03 +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
Alan Viverette
e84393674d Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev 2016-04-21 21:21:35 +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
Mihai Nita
7b1ae22837 Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d am: 76dca16404 
am: 6a3a15edf0

* commit '6a3a15edf04a57bbfd362116c8f811d169439ea4':
  Framework: change the TTS text to use the current locale

Change-Id: I56c71bd55c84c6ab2aaa9da6fb1ccd8ebbf08c61
 2016-04-21 20:08:24 +00: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
Mihai Niță
6a3a15edf0 Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d 
am: 76dca16404

* commit '76dca1640402e43854feda311b1bfe174afea664':
  Framework: change the TTS text to use the current locale

Change-Id: Iaabcdac0fd1bf8c6d3d6d3a9b7e87ca911518949
 2016-04-21 20:03:38 +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
Mihai Nita
f3aa91d9a4 Merge "Framework: change the TTS text to use the current locale" into nyc-dev 
am: 344bd5c63d

* commit '344bd5c63dfbe9a6aaef68144d04d3613563c080':
  Framework: change the TTS text to use the current locale

Change-Id: I23d1acfd0b53fddeec4e9ad183d90d1cf7a9708e
 2016-04-21 20:01:18 +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
Mihai Niță
344bd5c63d Merge "Framework: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:43 +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
Tony Mak
c65e3e8331 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev am: d3589ee715 am: f5f982f014 
am: b9362cf633

* commit 'b9362cf6332ee99042e6630c163babca04769aca':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I1ae8d5399470e449947d3ecf57285d39145d0a1e
 2016-04-21 16:00:57 +00:00
Tony Mak
f5f982f014 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: Id0e6e3cbc8cbea4e87625f479eb0d83dbf22266e
 2016-04-21 15:53:57 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification 
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
 2016-04-21 16:43:08 +01:00
Erik Kline
8124d17dfc Merge "Expand NetworkMonitor metrics" into nyc-dev am: b99d6af3ab am: 0f155c5778 
am: 9d73518433

* commit '9d7351843349945be98a712a2cfa27b85b57c72a':
  Expand NetworkMonitor metrics

Change-Id: I5ae6a60c774386f60cdb1a390ae7f9fac3f0d300
 2016-04-21 05:32:59 +00:00
Erik Kline
0f155c5778 Merge "Expand NetworkMonitor metrics" into nyc-dev 
am: b99d6af3ab

* commit 'b99d6af3ab406db14d161cdc0000ed521957d7ca':
  Expand NetworkMonitor metrics

Change-Id: I1d5475b998b6e29ad8bf43f8e457d9f4db85527a
 2016-04-21 05:28:30 +00:00
TreeHugger Robot
b99d6af3ab Merge "Expand NetworkMonitor metrics" into nyc-dev 2016-04-21 05:24:40 +00:00
Hugo Benichi
a27a918e03 Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de am: eb8372d38c 
am: 51d6d7ad5e

* commit '51d6d7ad5e866e7201c4d843a497b78f8a0607f8':
  Some fixes in ConnectivityService event logging

Change-Id: Icb50bdab260da6476c1d1148fa2d8995b106a809
 2016-04-21 04:19:53 +00:00
Hugo Benichi
51d6d7ad5e Merge "Some fixes in ConnectivityService event logging" into nyc-dev am: 7261fb27de 
am: eb8372d38c

* commit 'eb8372d38c31af196285d2fee60ae53adb113eca':
  Some fixes in ConnectivityService event logging

Change-Id: Ie356b2df2b84b36e6a2a52d3246ff434557ee89b
 2016-04-21 04:15:10 +00:00
Hugo Benichi
9fc5843fa8 Merge "Some fixes in ConnectivityService event logging" into nyc-dev 
am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31
 2016-04-21 04:12:56 +00:00
Hugo Benichi
dced5552ef Merge "Various fixes in IpReachability event logging" into nyc-dev am: 75f0346167 am: d8a8ea1e29 
am: c3795b94a3

* commit 'c3795b94a3d48a5184d13cea43a02aebcd31bb48':
  Various fixes in IpReachability event logging

Change-Id: I5b25861f1010ac008c3cafc51a720b42cb961fba
 2016-04-21 04:08:25 +00:00
Hugo Benichi
d8a8ea1e29 Merge "Various fixes in IpReachability event logging" into nyc-dev 
am: 75f0346167

* commit '75f0346167f9b8beb8d4b941e7a4ca8228e0737a':
  Various fixes in IpReachability event logging

Change-Id: Ibfea132ad824990464e4d488a717d34bd027b891
 2016-04-21 04:04:01 +00:00