Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,911 Commits 3 Branches 0 Tags
297a940edb190851682d1312becab965b606b296
Commit Graph

44022 Commits

Author SHA1 Message Date
George Mount
297a940edb am bc231f74: am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'bc231f74ffb488a5b559c9d5603819273ea30898':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:43:24 +00:00
George Mount
fbc0a6b385 am d91a4566: am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit 'd91a4566b14eecd672194a6cbce813ae9f5c6ecb':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:43:19 +00:00
Nancy Chen
c39c6f06a8 am a13366b6: am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit 'a13366b6279b047ad7bb4e0b2e8ef5e997e02b8a':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:30:39 +00:00
Jose Lima
b420cd132a am 639df5f0: am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '639df5f03738f244d1d1ef10f099e5784ee1b3e8':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:30:34 +00:00
George Mount
05951ddc63 am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 
* commit 'fc83d40438a331a6f06da4b4cb27c85621ef3019':
  Call SharedElementListener#setSharedElementEnd on back.
 2014-08-28 18:27:48 +00:00
George Mount
bc1d08849a am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev 
* commit '7ffe01f2158212c6b9c46e23e3167e832fe53c5f':
  Allow arbitrarily-added shared elements.
 2014-08-28 18:27:43 +00:00
Nancy Chen
389eda0398 am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev 
* commit '48add9d40e014cd585058358bbbb2e48fc10fe74':
  Add field for sub_id in call log for sprout database.
 2014-08-28 18:18:44 +00:00
Jose Lima
7fa75c1d58 am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 
* commit '0cdcdf5cd1517760dcff30004a3e0f5686e68440':
  Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
 2014-08-28 18:18:39 +00:00
Yigit Boyar
b304c42e11 am f7347ee4: am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit 'f7347ee497a07669a73968efecee3c6622258070':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 18:08:27 +00:00
George Mount
de18420aff Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev 2014-08-28 18:05:40 +00:00
George Mount
01abcaa295 Merge "Allow arbitrarily-added shared elements." into lmp-dev 2014-08-28 18:02:27 +00:00
Nancy Chen
d1a5a46368 Merge "Add field for sub_id in call log for sprout database." into lmp-dev 2014-08-28 17:55:50 +00:00
Yigit Boyar
4286fa20f5 am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 
* commit '9662e6ded368d0eeaca0ca857be3c32eeb5f3f40':
  Use a weak observable in AutoCompleteTextView
 2014-08-28 17:51:58 +00:00
Jose Lima
d3458a9c34 Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev 2014-08-28 17:49:32 +00:00
Yigit Boyar
3e92d2ec47 Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev 2014-08-28 17:33:36 +00:00
Chet Haase
fb609eacf0 am d8646c8d: am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 
* commit 'd8646c8d31e55ff4dd2fbf80f13a545c65925d72':
  Canceling ViewPropertyAnimator now removes pending actions
 2014-08-28 17:22:12 +00:00
Robert Greenwalt
6afc1ac0d7 am 65ce2f17: am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '65ce2f1703a9e150e08cf3424e5e88bb84cae81c':
  Clean up Connectivity Logging.
 2014-08-28 17:10:53 +00:00
Chet Haase
b198e5e475 am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 
* commit 'b6c2cf70d0e4918093e1ca3d1056facbf196ac7c':
  Canceling ViewPropertyAnimator now removes pending actions
 2014-08-28 17:09:29 +00:00
Robert Greenwalt
c8ff9c4d9f am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev 
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
  Clean up Connectivity Logging.
 2014-08-28 16:54:42 +00:00
Jeff Sharkey
d380f5604f am bc55cead: am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'bc55cead16c51a846c3fc1c8afd2aaf3d02e0b25':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:47:39 +00:00
Chet Haase
06c34e7cbe Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev 2014-08-28 16:42:27 +00:00
Jeff Sharkey
896fe7aa04 am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 
* commit 'cb1236be15023152535cedfb9ed20a0c8b94ada1':
  Define EXTRA_SIZE for ContentProviders.
 2014-08-28 16:36:01 +00:00
Robert Greenwalt
2836dbb953 Merge "Clean up Connectivity Logging." into lmp-dev 2014-08-28 16:29:55 +00:00
Jeff Sharkey
ca5186e9d5 Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev 2014-08-28 16:12:47 +00:00
Nancy Chen
3a78092127 Add field for sub_id in call log for sprout database. 
Adding sub_id as a column in the calls table to make the sprout and
non-sprout contacts databases consistent.

Bug: 14990572
Change-Id: I82d9fe65e6cdf4e10b6115a8565c2be3a6f93562
 2014-08-28 08:47:27 -07:00
Chet Haase
5637b7d239 Canceling ViewPropertyAnimator now removes pending actions 
Normally, calling cancel() on ViewPropertyAnimator() will cancel any
running animations as well as any associated actions (layers and
start/end actions). But if the animation is canceled before the first
frame, these other actions are still pending and will not be canceled.

This fix also cancels these pending actions.

Issue #17296082 VPA.cancel() doesn't clear the end action

Change-Id: If104d21c1e2d64516500048a06ba217284732ef0
 2014-08-28 07:53:59 -07:00
Selim Cinek
bef1942fab am 06585ecf: am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner 
* commit '06585ecfc7e33fad947bd073e27ec4f18d804713':
  Added a warning when the profile has an owner
 2014-08-28 14:01:41 +00:00
Selim Cinek
f1d8349bb3 am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner 
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
  Added a warning when the profile has an owner
 2014-08-28 13:49:25 +00:00
Selim Cinek
24ac55e658 Added a warning when the profile has an owner 
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.

Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
 2014-08-28 15:09:28 +02:00
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 11:01:36 +00:00
Esteban Talavera
20b41f85f0 am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked 
* commit 'da3a898110b91fb913e539e38b68233d12bf54ca':
  Renamed getUninstallBlocked to isUninstallBlocked
 2014-08-28 10:49:21 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked 
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
 2014-08-28 10:56:18 +01:00
Jae Seo
98a1942f20 am d55533a7: am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit 'd55533a7d301205dff23ba2d01cc8d7d7fc47457':
  Add android.software.live_tv feature
 2014-08-28 09:41:59 +00:00
Jose Lima
fcf7083eab Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled() 
API review request.

Bug: 17288987
Change-Id: If63f847ce630a57e4aa1e5291befe2863cb7e0c7
 2014-08-27 23:09:05 -07:00
Jae Seo
41b12ff46b am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev 
* commit 'edf8161ea45f134b0732634aac8afa7836f1bab1':
  Add android.software.live_tv feature
 2014-08-28 06:07:54 +00:00
Jae Seo
11cfe2c036 Merge "Add android.software.live_tv feature" into lmp-dev 2014-08-28 05:50:19 +00:00
Selim Gurun
bd9e521c43 am 2537ad58: am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '2537ad58dacfe8aa84d467782df10fb4ef9de366':
  Address API Feedback
 2014-08-28 04:17:42 +00:00
John Reck
d21fb2fe93 am 7a86c785: am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '7a86c7859b2ccdb4f424c4b9bd946ebf0b4cdf3f':
  Animator stuff
 2014-08-28 04:17:37 +00:00
Svetoslav
16cbc6f2a4 am adda4d75: am 84805a00: am b4bd1427: Merge "Fix live region updates." into lmp-dev 
* commit 'adda4d75fb209ce6bee5872c85b5f9ba1a1534d7':
  Fix live region updates.
 2014-08-28 04:17:32 +00:00
Yorke Lee
af74216c4e am 64c86ede: am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '64c86edeb93c8b7dcde4c2a6288414e3ab416055':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 04:17:16 +00:00
Michael Wright
cb14761ed4 am f06b6386: am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f06b6386de250240cbaaa5cca922a4f9e8915680':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 04:17:06 +00:00
Filip Gruszczynski
4185f1620f am 7657388c: am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '7657388c235e87c622bf821a8a48b5566db70a51':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 04:16:55 +00:00
Selim Gurun
9342a657d9 am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev 
* commit '405c03aded694e85ee278f650a19988a8c17f8c4':
  Address API Feedback
 2014-08-28 03:39:27 +00:00
John Reck
59f71093fe am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev 
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
  Animator stuff
 2014-08-28 03:39:21 +00:00
Svetoslav
eebff5a5a1 am 84805a00: am b4bd1427: Merge "Fix live region updates." into lmp-dev 
* commit '84805a00a3ed0234948b76274c93a60f36e96e00':
  Fix live region updates.
 2014-08-28 03:39:16 +00:00
Yorke Lee
1238a8e7d3 am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev 
* commit '9aedb262a98532e30658c00e5acff33c1b7c32a9':
  Update value of EXTRA_CALL_TYPE_FILTER
 2014-08-28 03:38:18 +00:00
Michael Wright
17f7fa5cfe am f7898245: am d0f6975b: Merge "Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY" into lmp-dev 
* commit 'f7898245a265106672ff29f35289c703ed50c7ce':
  Change constant to PowerManager#FLAG_WAIT_FOR_DISTANT_PROXIMITY
 2014-08-28 03:38:00 +00:00
Filip Gruszczynski
bbc0f67195 am 2a81e91f: am 21187a7a: Merge "Allowing isRound and outsetBottom properties to be passed to ActivityView." into lmp-dev 
* commit '2a81e91f63c14ddf04c82a124096553c36924344':
  Allowing isRound and outsetBottom properties to be passed to ActivityView.
 2014-08-28 03:37:54 +00:00
Selim Gurun
d576bf310b Merge "Address API Feedback" into lmp-dev 2014-08-28 01:47:31 +00:00
John Reck
4c5a27b5f6 Merge "Animator stuff" into lmp-dev 2014-08-28 01:38:58 +00:00