Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,711 Commits 3 Branches 0 Tags
832775b7f3327af6afad375bee465ef2d1eedb48
Commit Graph

63962 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Hugo Benichi
7261fb27de Merge "Some fixes in ConnectivityService event logging" into nyc-dev 2016-04-21 04:02:55 +00:00
Erik Kline
a488c23dd5 Expand NetworkMonitor metrics 
- add netid to CaptivePortalStateChangeEvent
    - add NetworkMonitorEvent for simple duration measurements

Bug: 28204408
Change-Id: I62035e07d64013878a0bce30c67c929c2c7e7a85
 2016-04-21 13:02:55 +09:00
Hugo Benichi
75f0346167 Merge "Various fixes in IpReachability event logging" into nyc-dev 2016-04-21 03:54:18 +00:00
Ruchi Kandoi
fb8c76df29 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 
am: 316c68f144

* commit '316c68f144946a3019cc8f314921e8588c766b71':
  fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link

Change-Id: If4cc351b8674343cbb83e22bcfccf9e7b4d00484
 2016-04-21 02:46:51 +00:00
Ruchi Kandoi
316c68f144 Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev 2016-04-21 02:37:50 +00:00
Hugo Benichi
5f16f760ad Some fixes in ConnectivityService event logging 
Bug: 28204408
Change-Id: I44ed9539bb213a845c2bcc2861c947af7c3c9ef4
 2016-04-21 11:03:08 +09:00
Christopher Tate
11c07421da Merge "Only invoke k/v helpers during k/v operations" into nyc-dev 
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b
 2016-04-21 01:20:17 +00:00
Christopher Tate
c9e584b422 Only invoke k/v helpers during k/v operations 
In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.

Bug 28132784

Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93
 2016-04-21 01:11:06 +00:00
Amith Yamasani
bc25c87c57 Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 
am: 2be4c463bc

* commit '2be4c463bc6411cf6fb9e2a4be0cbb90c485d0de':
  Throw better exception when startVoiceActivity fails

Change-Id: Ie8dfd6ed1f366e24418f352c810281ca687c70fb
 2016-04-21 00:50:10 +00:00
Adam Lesinski
051b810da6 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
 2016-04-21 00:50:07 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev 
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
 2016-04-21 00:50:04 +00:00
TreeHugger Robot
2be4c463bc Merge "Throw better exception when startVoiceActivity fails" into nyc-dev 2016-04-21 00:46:32 +00:00
Adam Lesinski
c708cf6340 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 2016-04-21 00:39:59 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Tim Murray
b16a93f955 Merge "Increase the max binder thread pool size for system_server." into nyc-dev 
am: 150553756f

* commit '150553756f89a51cc70b24cd9dbab4bdfba0fc59':
  Increase the max binder thread pool size for system_server.

Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652
 2016-04-21 00:39:06 +00:00
Philip P. Moltmann
458216854a Merge "Prevent printing from finishing activity." into nyc-dev 
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45
 2016-04-21 00:34:36 +00:00
Tim Murray
150553756f Merge "Increase the max binder thread pool size for system_server." into nyc-dev 2016-04-21 00:32:47 +00:00