Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,682 Commits 3 Branches 0 Tags
abb46992eb49dd0458b7a6ada46d985115b08763
Commit Graph

198682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
abb46992eb am 2f263d1f: am ebf6fc60: Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev 
* commit '2f263d1fa7352b45d86db2203d2546bdb27437c3':
  Stops BLE scan when scan only mode is disabled.
 2015-06-12 17:45:45 +00:00
Wei Wang
2f263d1fa7 am ebf6fc60: Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev 
* commit 'ebf6fc60b51ecf27f0a8f2c062a4644a4174b187':
  Stops BLE scan when scan only mode is disabled.
 2015-06-12 17:32:54 +00:00
Jeff Sharkey
551ca4ffc4 am 05107ddf: am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev 
* commit '05107ddf2069f3ea0d8ef01d20d6bc4d65addc7a':
  Annotate ContentProviderClient arguments.
 2015-06-12 17:31:46 +00:00
Dianne Hackborn
ccd6d0c14d am d55860d9: am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit 'd55860d990587509f0e9624c44494172f3e24714':
  Fix APIs.
 2015-06-12 17:31:21 +00:00
Wei Wang
ebf6fc60b5 Merge "Stops BLE scan when scan only mode is disabled." into mnc-dev 2015-06-12 17:20:34 +00:00
Jeff Sharkey
05107ddf20 am 54b65ff3: Merge "Annotate ContentProviderClient arguments." into mnc-dev 
* commit '54b65ff3004a1585867e8c3c4d267b381123e179':
  Annotate ContentProviderClient arguments.
 2015-06-12 17:09:41 +00:00
Jeff Sharkey
54b65ff300 Merge "Annotate ContentProviderClient arguments." into mnc-dev 2015-06-12 16:57:56 +00:00
Chet Haase
2af689dfb7 am b5ac26ea: am 3d1f7c26: Merge "Clarify Drawable.getOpacity() docs" into mnc-dev 
* commit 'b5ac26ead2bc6ee1162371aab0557c5c77a765a1':
  Clarify Drawable.getOpacity() docs
 2015-06-12 16:50:55 +00:00
Jeff Sharkey
73ed509d44 Annotate ContentProviderClient arguments. 
Explicitly mark if they're @Nullable or @NonNull.

Bug: 21560515
Change-Id: Id0a208a38c5a9ea19dddbe60c65d285645d08bb0
 2015-06-12 09:49:31 -07:00
Dianne Hackborn
d55860d990 am 8a435ced: Merge "Fix APIs." into mnc-dev 
* commit '8a435ced674562b827f91800317a89056e050b15':
  Fix APIs.
 2015-06-12 16:47:44 +00:00
Dianne Hackborn
8a435ced67 Merge "Fix APIs." into mnc-dev 2015-06-12 16:34:38 +00:00
Chet Haase
b5ac26ead2 am 3d1f7c26: Merge "Clarify Drawable.getOpacity() docs" into mnc-dev 
* commit '3d1f7c26be89a252c6e83c0b813df27295d06212':
  Clarify Drawable.getOpacity() docs
 2015-06-12 16:34:27 +00:00
Chet Haase
3d1f7c26be Merge "Clarify Drawable.getOpacity() docs" into mnc-dev 2015-06-12 16:24:31 +00:00
Alex Klyubin
88fc537102 am d3f2657e: am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit 'd3f2657ee3655eb07d3772d6ce0b7fdbfe2cf48d':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:22:43 +00:00
Chet Haase
96a443b58d Clarify Drawable.getOpacity() docs 
Docs for translucent-vs-transparent-vs-opaque were confusing, especially since
the definition for those constants in PixelFormat are not the same as how they're
actually used in Drawable. This fix simply adds clarifying text to the method
comment for getOpacity().

Issue #21158891  Better document Drawable#getOpacity

Change-Id: I94725592f85e5d7874e3a3ac1c5bab969163fbf0
 2015-06-12 17:21:31 +01:00
Alex Klyubin
d3f2657ee3 am 738241f9: Merge "Document that DownloadManager supports HTTPS." into mnc-dev 
* commit '738241f93c066a2ef233dd0e12661bf808bfd915':
  Document that DownloadManager supports HTTPS.
 2015-06-12 16:12:04 +00:00
Alex Klyubin
738241f93c Merge "Document that DownloadManager supports HTTPS." into mnc-dev 2015-06-12 16:02:17 +00:00
Chet Haase
501209dfc0 am 16b4e751: am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit '16b4e7515d49c52df9f049f40f324d714e745459':
  Remove View.getBackgroundColor()
 2015-06-12 15:16:35 +00:00
Chet Haase
16b4e7515d am e61fc94b: Merge "Remove View.getBackgroundColor()" into mnc-dev 
* commit 'e61fc94b9b6d4ccba60cca9ac0e0a67539f18780':
  Remove View.getBackgroundColor()
 2015-06-12 15:03:06 +00:00
Chet Haase
e61fc94b9b Merge "Remove View.getBackgroundColor()" into mnc-dev 2015-06-12 14:50:20 +00:00
Andrew Flynn
17ba952d29 am bf341d45: am b386e77e: Merge "SysUI: Status bar ImageViews" into mnc-dev 
* commit 'bf341d45ee3b3012e0aaad86ae08b03932c52fe3':
  SysUI: Status bar ImageViews
 2015-06-12 14:20:10 +00:00
Andrei Stingaceanu
9666389ef7 am fd988a3b: am 015e96cc: Floating toolbar old theme fix 
* commit 'fd988a3b6f9580e6030bb99af21ec6d28483083c':
  Floating toolbar old theme fix
 2015-06-12 14:06:53 +00:00
Andrew Flynn
bf341d45ee am b386e77e: Merge "SysUI: Status bar ImageViews" into mnc-dev 
* commit 'b386e77eaadf76fe59051bd27c3013427828034b':
  SysUI: Status bar ImageViews
 2015-06-12 14:06:46 +00:00
Andrew Flynn
b386e77eaa Merge "SysUI: Status bar ImageViews" into mnc-dev 2015-06-12 13:58:12 +00:00
Andrew Flynn
0f27a3f0d7 SysUI: Status bar ImageViews 
- Switch AlphaOptimizedImageView to have the boolean hasOverLappingRendering()
  return be a custom value. This allows us to have AnimatedImageView extend
  AlphaOptimizedImageView and support both types of ImageViews w/o having to
  create 2x subclasses.
- Add drawable ID tracking to AnimatedImageView so that we don't interrupt
  animations with an update of the exact same drawable.
- Switch mobile signal icon to use AnimatedImageView so that animations aren't
  interrupted.

Bug: 21504588
Change-Id: Ic2275f1bf607449c191ae0d08bc7756c7d694bc1
 2015-06-12 09:56:56 -04:00
Andrei Stingaceanu
fd988a3b6f am 015e96cc: Floating toolbar old theme fix 
* commit '015e96cc95b09d9562f95dbb24f2ec8e5bbfa2d4':
  Floating toolbar old theme fix
 2015-06-12 13:55:06 +00:00
Chet Haase
3dcb9945fd Remove View.getBackgroundColor() 
This method was added earlier in M - removing it now based on API
Council feedback.

Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: I04fad49c3c377218d0fb708dbeaea609aca46ce8
 2015-06-12 13:25:27 +01:00
Andrei Stingaceanu
015e96cc95 Floating toolbar old theme fix 
The floating toolbar now has it's own theming:
* material_light used for all light themes
* material_dark for dark themes

The attributes are not public.

Bug: 21177954
Change-Id: I7ccf9c677be44d510ab48168c0215d37456be059
 2015-06-12 13:24:16 +01:00
Keisuke Kuroyanagi
60a640f415 am 3015edb0: am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit '3015edb01e35d35f2971af7c6c9c6cfe9a2b8b2c':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:32:59 +00:00
Keisuke Kuroyanagi
3015edb01e am a31940df: Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 
* commit 'a31940df170ea7e8253736ce7b5dba2176699c25':
  Reset drag accelerator state in Editor#sendOnTextChanged.
 2015-06-12 11:19:53 +00:00
Keisuke Kuroyanagi
a31940df17 Merge "Reset drag accelerator state in Editor#sendOnTextChanged." into mnc-dev 2015-06-12 11:10:20 +00:00
Alex Chau
302d2d56e2 am cb40c0c9: am b24f01f4: Merge "Notification shown upon work profile deletion" into mnc-dev 
* commit 'cb40c0c90e89196bbf342e9448e5170eb86a4f41':
  Notification shown upon work profile deletion
 2015-06-12 10:36:38 +00:00
Alex Chau
cb40c0c90e am b24f01f4: Merge "Notification shown upon work profile deletion" into mnc-dev 
* commit 'b24f01f473b98e98f0c80b1a937a18921cf0521a':
  Notification shown upon work profile deletion
 2015-06-12 10:25:32 +00:00
Rubin Xu
d841ebb7e7 am c13ea212: am 5c82d2cc: Change references to APK Certificate to Signature 
* commit 'c13ea21249455708a5d1ffb42ef0a4751214c6b1':
  Change references to APK Certificate to Signature
 2015-06-12 10:17:44 +00:00
Alex Chau
b24f01f473 Merge "Notification shown upon work profile deletion" into mnc-dev 2015-06-12 10:14:27 +00:00
Rubin Xu
c13ea21249 am 5c82d2cc: Change references to APK Certificate to Signature 
* commit '5c82d2cc17df9774e677f6bab9cb52659fc2b56d':
  Change references to APK Certificate to Signature
 2015-06-12 10:01:24 +00:00
Rubin Xu
5c82d2cc17 Change references to APK Certificate to Signature 
The fact that currently apk signature is certificates is just
implementation details.

Bug: 20820366

Change-Id: Icdd02cb51a550ea71ff83a84e2bdfcc21f8d43ed
 2015-06-12 10:32:24 +01:00
Svet Ganov
986506c42a am f4c6f135: am 7f55b008: Merge "Revert write secure settings permission protection level." into mnc-dev 
* commit 'f4c6f1352f3b19fa9b38b0816b7e359fb2f0fced':
  Revert write secure settings permission protection level.
 2015-06-12 07:49:28 +00:00
Svet Ganov
f4c6f1352f am 7f55b008: Merge "Revert write secure settings permission protection level." into mnc-dev 
* commit '7f55b0080a96b89807a29ce5affb4e0580c098f8':
  Revert write secure settings permission protection level.
 2015-06-12 07:37:46 +00:00
Svet Ganov
7f55b0080a Merge "Revert write secure settings permission protection level." into mnc-dev 2015-06-12 07:30:34 +00:00
Svet Ganov
353d0ef935 Revert write secure settings permission protection level. 
bug:21619456

Change-Id: I31212d3677b74fbf26b2d9eb222a2a8132de2271
 2015-06-12 00:28:47 -07:00
Jeff Sharkey
a1d8a67b6f am 9b68fb74: am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit '9b68fb745ca26f725ae174623cc6e1183f9d9ca6':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:15:43 +00:00
Yohei Yukawa
4c231bf412 am 16efc517: am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 
* commit '16efc517be792d9aec284ae7d8cbba81027ca971':
  Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
 2015-06-12 05:15:39 +00:00
Jens Ole Lauridsen
80cf5fdf25 am 3a991acb: am 3f6bd481: Merge "Support AppBar from Material Design." into mnc-dev 
* commit '3a991acbb92851a2d97e8e8168f4c83a08b34647':
  Support AppBar from Material Design.
 2015-06-12 05:03:07 +00:00
Jeff Sharkey
9b68fb745c am 3c4d6139: Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 
* commit '3c4d613926afb38673e0ffccc624d271f7910ec1':
  Sigh, some apps are sending null ContentValues.
 2015-06-12 05:03:03 +00:00
Jeff Sharkey
aaf42c9ea0 am c69a4fc5: am 1c83a043: Merge "Annotate ContentResolver/Provider arguments." into mnc-dev 
* commit 'c69a4fc556b8c4bd6d28abde3c73b65384a6c574':
  Annotate ContentResolver/Provider arguments.
 2015-06-12 05:03:03 +00:00
Yohei Yukawa
16efc517be am 09259de0: Merge "Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b." into mnc-dev 
* commit '09259de032c5209cbc8c094bd4121358932f1139':
  Fix JavaDoc error in I392166c77cd9dd2c432dc4f1274312f8355de02b.
 2015-06-12 05:02:59 +00:00
Jonathan Basseri
cc5bdae69a am 7bfd0b58: am ecadb92e: Merge "Read MMS config from CarrierConfigManager." into mnc-dev 
* commit '7bfd0b58f4252dd7d5b6a3ad4c8ac741321797de':
  Read MMS config from CarrierConfigManager.
 2015-06-12 05:02:59 +00:00
Jeff Sharkey
3c4d613926 Merge "Sigh, some apps are sending null ContentValues." into mnc-dev 2015-06-12 04:57:08 +00:00
Jeff Sharkey
34796bd07f Sigh, some apps are sending null ContentValues. 
Bug: 21560515
Change-Id: Id5a62611781a2d9da47ad3e522d3d43f860b1f70
 2015-06-11 21:55:32 -07:00