Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,863 Commits 3 Branches 0 Tags
2d73a5a46c44cc39ffbca615ea87afb3ae647c8a
Commit Graph

47503 Commits

Author SHA1 Message Date
Jeff Sharkey
2d73a5a46c am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 
* commit '2a9f87cfdf440ed6cfe92ab3428ca8d193586a2f':
  Avoid NPE when fsUuid is null.
 2015-05-05 01:21:50 +00:00
Jeff Sharkey
5f809e3fff Merge "Avoid NPE when fsUuid is null." into mnc-dev 2015-05-04 19:06:39 +00:00
Jeff Sharkey
c840681dbd Avoid NPE when fsUuid is null. 
Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1
 2015-05-04 12:04:09 -07:00
Jose Lima
57b7573210 am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 
* commit 'bb9045ea4056901f84ba4d01d3fd5065063c7e39':
  Move ContentInfoExtender from Notification.java to a support library
 2015-05-04 16:43:41 +00:00
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
John Reck
0b1c17bd31 am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev 
* commit '01b321de0bd179a1366c5f344fa1b094571fd5f4':
  Remove Bitmap#getSkBitmap
 2015-05-04 14:47:13 +00:00
John Reck
dd447382cd am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 
* commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992':
  Move AssetAtlas off of SkBitmap*
 2015-05-04 14:47:07 +00:00
Tor Norbye
20ccf13fbc am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev 
* commit '7a560701fda09522c5da1212d5ad8e3d81780c7c':
  Add permission annotations on the AccountManager
 2015-05-04 14:42:21 +00:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Tor Norbye
335f043bdb Merge "Add permission annotations on the AccountManager" into mnc-dev 2015-05-04 14:19:20 +00:00
Tor Norbye
80b530afdb Add permission annotations on the AccountManager 
Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3
 2015-05-04 06:29:55 -07:00
Matthew Williams
ead811790e am c341c1f7: am 303650c9: Add full backup criteria to android manifest 
* commit 'c341c1f75c8d33d133e6e5e059cfb19c341d444c':
  Add full backup criteria to android manifest
 2015-05-03 23:41:40 +00:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest 
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
 2015-05-03 16:19:27 -07:00
Svet Ganov
a938239f33 am 6a67cd45: am ca030f8e: Merge "Add read cell broadcast app op - framework" into mnc-dev 
* commit '6a67cd450460ffece60713a0e9456d7637469e15':
  Add read cell broadcast app op - framework
 2015-05-03 01:00:23 +00:00
Svetoslav
4e71319952 am 0f74977b: am e9fc4cda: Merge "Add camera app op - framework" into mnc-dev 
* commit '0f74977b5c7c5df6a2331e32176f6d130e51b68d':
  Add camera app op - framework
 2015-05-03 01:00:18 +00:00
Svet Ganov
ede431678e Add read cell broadcast app op - framework 
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
 2015-05-02 17:42:44 -07:00
Svetoslav
fbf0ecabac Add camera app op - framework 
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
 2015-05-02 16:23:19 -07:00
Jose Lima
4fdcc184e6 Move ContentInfoExtender from Notification.java to a support library 
Bug: 20643107

Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
 2015-05-01 18:32:26 -07:00
Raph Levien
86de59aa33 am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev 
* commit '741d6120be20200e5ff6484c8b7293dfc4880dba':
  Expose StaticLayout.Builder publicly
 2015-05-02 01:08:00 +00:00
Raph Levien
151ccb9f58 am 96a9c9b5: am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 
* commit '96a9c9b5896aa6a8a956cc5fffca3f98b8c155c0':
  Make Paint a required field of StaticLayout Builder
 2015-05-02 01:07:55 +00:00
Yohei Yukawa
f436e6e848 am 14a60950: am b6bec1a4: Remove unused methods/variables/fields from Editor.java. 
* commit '14a60950b24e0ae40f5fa611eb28f0453c3d583c':
  Remove unused methods/variables/fields from Editor.java.
 2015-05-02 01:07:50 +00:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801 Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 2015-05-02 00:41:51 +00:00
Svet Ganov
107cd552f1 am 17daa3d0: am 574f5379: Merge "Add body sensors app op - framework base" into mnc-dev 
* commit '17daa3d02c6427b086710ca6d386202cde47c6ae':
  Add body sensors app op - framework base
 2015-05-01 23:34:54 +00:00
Yohei Yukawa
b6bec1a403 Remove unused methods/variables/fields from Editor.java. 
This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
 2015-05-01 23:30:35 +00:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly 
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
 2015-05-01 15:15:48 -07:00
Chris Craik
6e51a707ea am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev 
* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
 2015-05-01 22:05:57 +00:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap 
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
 2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty"" 
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde2.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
 2015-05-01 14:30:15 -07:00
Chris Craik
9eeb725d91 am 3deb109a: am 5c705c59: Merge "Fix build." into mnc-dev 
* commit '3deb109a7423eddf51b6242378123f09cd56c69e':
  Fix build.
 2015-05-01 21:25:36 +00:00
Chris Craik
e920b1459a am 2551857f: am f4ff8f70: Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 
* commit '2551857feed723c30759a40ae9429110c453d2d3':
  Merge getDisplayList and updateDisplayListIfDirty
 2015-05-01 21:03:49 +00:00
Chris Craik
ed8623690b am 3059dbb6: am 04c0f415: Merge "Update alpha documentation" into mnc-dev 
* commit '3059dbb65ac77e663fb4e89317fcafa3d2f6d9e2':
  Update alpha documentation
 2015-05-01 21:03:44 +00:00
Jorim Jaggi
83fb90f61f am 3f5f1cb6: am 0629a5d5: Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 
* commit '3f5f1cb66441e9dd42a6d295c33e08b1f956fff6':
  Rename supportsAssistGesture to supportsAssist
 2015-05-01 21:03:39 +00:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build. 
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b53.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
 2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00
Chris Craik
f4ff8f701f Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5 Merge "Update alpha documentation" into mnc-dev 2015-05-01 20:36:03 +00:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist 
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
 2015-05-01 13:33:38 -07:00
Alan Viverette
f71c93ff9a am aeedef55: am da0d6a6b: Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 
* commit 'aeedef552d64027d7de40d4cc13c182f97250b6e':
  Correctly handle intercepted touch events in FastScroller
 2015-05-01 18:48:46 +00:00
Ruben Brunk
128a2fa002 am 626cd0fb: am 0f2be13d: camera: Update Camera2 API for arbitration. 
* commit '626cd0fbc45947ccc7fa6022b8daa000e4c04258':
  camera: Update Camera2 API for arbitration.
 2015-05-01 18:48:41 +00:00
Fabrice Di Meglio
620649263f am 359b96e5: am 83bb765b: Merge "Add IntentFilter auto verification - part 7" into mnc-dev 
* commit '359b96e5560211c757027b4f2df59f69e7d5514f':
  Add IntentFilter auto verification - part 7
 2015-05-01 18:48:31 +00:00
Yohei Yukawa
784480b62c am 71cbadf3: am 097d5f10: Merge "Suggestions popup must be dismissed before device rotation." into mnc-dev 
* commit '71cbadf3971c67a839d91c6685ba88c9b938b1ce':
  Suggestions popup must be dismissed before device rotation.
 2015-05-01 18:48:20 +00:00
Amith Yamasani
bd898e707b am 17d5e266: am 92d42057: Merge "Exclude bound app widgets from idle app list" into mnc-dev 
* commit '17d5e2660663b4c09b3e94c9a92d8e80f657ed95':
  Exclude bound app widgets from idle app list
 2015-05-01 18:48:15 +00:00
Alan Viverette
da0d6a6b8a Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 2015-05-01 18:30:26 +00:00
Ruben Brunk
0f2be13dc6 camera: Update Camera2 API for arbitration. 
- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3
 2015-05-01 18:28:13 +00:00