Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,159 Commits 3 Branches 0 Tags
613d076fa58bc4d48d5e0e197300a1f1be7c3dbb
Commit Graph

4734 Commits

Author SHA1 Message Date
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
 2014-09-11 14:12:36 +00:00
Kenny Guy
1985b7e138 am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'a6e2ae352bf74ec29ae60d3f21e900d73e7da14e':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:32:20 +00:00
Christoph Studer
b14eb90414 am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '27674421aef9e3e3dd521a042b3fa939f9c92517':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:32:09 +00:00
Kenny Guy
c8824b18c1 Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 2014-09-10 11:14:59 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Jessica Hummel
285890c52d am fa2d0222: am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit 'fa2d0222de3f4c627e52647793a037cdd8bd110a':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:41:21 +00:00
Jessica Hummel
e0c2e0dbb4 am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '9a21c2a39afb36d1105680139acddb9adf4a9791':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:31:40 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Christopher Tate
6e78c704e7 am 2e44285f: am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '2e44285f8a7a235cb2ac44514bc702f9e3fd76eb':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 01:09:22 +00:00
Christopher Tate
239e587ab9 am 1ca58e08: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 
* commit '1ca58e08f44ae97ed238bdbb820eea12d62f6ce3':
  Fix BackupManager.isBackupEnabled()
 2014-09-10 00:50:41 +00:00
Christopher Tate
9e079298ed Fix BackupManager.isBackupEnabled() 
It wasn't properly lazy-initializing the service binder, so it always
thought the backend service didn't exist, and so always returned false.

Also directly validated that every usage of sService in the module is
now correctly lazy-initialized.

Bug 16661321

Change-Id: If5fbb18aef81bfa8fd70eb40a1f6af54cc96d804
 2014-09-09 22:36:14 +00:00
Griff Hazen
88a9c55233 am f26b4fda: am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'f26b4fdac14531e9a18a476db1ddf07a0cadefe8':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:58:14 +00:00
Griff Hazen
1d67649c61 am accb122d: am c06b7a78: Copy visibility docs from support version to base Notification. 
* commit 'accb122dcd7b45914b508299af0b44376745bed3':
  Copy visibility docs from support version to base Notification.
 2014-09-09 18:47:29 +00:00
Craig Mautner
cb9bbc7f77 am 37af2b51: am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '37af2b51c5f3198392de94acbf2ec13ed9563be4':
  Remove deprecated (and now unused) API method.
 2014-09-09 18:08:20 +00:00
Griff Hazen
fc3922d49b Copy visibility docs from support version to base Notification. 
(Noticed the difference in a javadoc diff between Notification and
NotificationCompat)

Bug: 17424399

Change-Id: I639a46c429ffebf8ca47118b2ea80f40ccdc1286
 2014-09-09 18:03:40 +00:00
Craig Mautner
c8cc92f852 am 2297d88d: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev 
* commit '2297d88d163daafde81d41e13d2207fc64865a72':
  Remove deprecated (and now unused) API method.
 2014-09-09 17:21:35 +00:00
Craig Mautner
345d4f4f14 Merge "Remove deprecated (and now unused) API method." into lmp-dev 2014-09-09 17:05:04 +00:00
Dianne Hackborn
0b95125d99 am 1420cfbf: am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '1420cfbf788fa9272f43231c15be29f7febdcde3':
  Add new wallpaper features for insets and offsets.
 2014-09-09 17:00:07 +00:00
Dianne Hackborn
aadc76edb1 am 2146dc79: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev 
* commit '2146dc791c53895b60161d8819b25b4277290c4b':
  Add new wallpaper features for insets and offsets.
 2014-09-09 16:55:06 +00:00
Dianne Hackborn
bb8c483461 Merge "Add new wallpaper features for insets and offsets." into lmp-dev 2014-09-09 16:41:44 +00:00
Craig Mautner
0321573fa7 Remove deprecated (and now unused) API method. 
Removes ActivityOptions.makeLaunchTaskBehindAnimation().

Fixes bug 16958544.

Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
 2014-09-09 08:53:56 -07:00
Christoph Studer
aca4b25f47 Notification: Use ViewStub for ProgressBar 
Lazily inflate ProgressBars since they're expensive.

Bug: 17366831
Bug: 17399567
Change-Id: I2b85169a67d41a66fead2fccef2381eaa671c3e4
 2014-09-09 15:58:41 +02:00
Dianne Hackborn
067e5f68b9 Add new wallpaper features for insets and offsets. 
Issue #17394151: WallpaperService / Engines need to get notified
of WindowInsets

Issue #17394203 Wallpapers need a system API to be shifted in order
to support burn in protection

Adds a new API on WallpaperManager to set additional offsets to
make wallpapers extend beyond the display size.

Insets are now reported to wallpapers, to use as they may.  This
includes information about the above offsets, so they can place
their content within the visible area.  And to help with this, also
expose the stable offsets APIs in WindowInsets which is also very
useful information for the wallpaper.

Another new API on WallpaperManager to set a raw offset to apply
to the wallpaper window, forcing it to move on the screen regardless
of what the wallpaper is drawing.

Fix wallpapers when used with overscan enabled, so they still extend
out across the entire screen.  Conveniently, the above new window
insets information is very useful for this case as well!

And a new wallpaper test app for all this stuff.

Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
 2014-09-08 18:02:18 -07:00
Kenny Guy
3f5cb5dca7 am 9c7d3b6d: am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into l 
* commit '9c7d3b6dbc64d58a919a6ad8a8b8235218825628':
  Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
 2014-09-08 20:31:33 +00:00
Kenny Guy
ff25ce9b7b am 9e9524a4: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev 
* commit '9e9524a4fcd6392114b6f024a21d31e78e62422c':
  Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting.
 2014-09-08 20:21:08 +00:00
Elliott Hughes
a559a68c36 am d2f9559a: Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit 'd2f9559ad7cff93527a05cb85172a7bb29f4d9b2':
  Small documentation fixes across many files.
 2014-09-08 20:15:07 +00:00
Jorim Jaggi
57d240c54b am fbc3e5f1: am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev 
* commit 'fbc3e5f158f5ea720e7b550da2fc202850d50d08':
  Restrict line count for BigTextStyle
 2014-09-08 20:15:02 +00:00
Elliott Hughes
1eb6a248ac Merge "resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-08 20:10:04 +00:00
Kenny Guy
8942bcd6ea Remember userId when stripping / rebuilding notification. 
ApplicationInfo.uid isn't enough because when system
posts notifications it Context.getUserId doesn't match
userId bit of ApplicationInfo.uid, so put back the
mOriginatingUserId.

Bug: 17002733
Change-Id: Ie3d8de121255bcb551cbe80c263e74f1a60b6f1c
 2014-09-08 21:09:47 +01:00
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp 
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
 2014-09-08 13:08:43 -07:00
Jorim Jaggi
58efcc60b9 am b226b3bf: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev 
* commit 'b226b3bfdde6bb1b0a6cf4b7bf40bcb5821784d8':
  Restrict line count for BigTextStyle
 2014-09-08 20:05:18 +00:00
Kenny Guy
48f0b48555 Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn't make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev 2014-09-08 20:02:10 +00:00
Jorim Jaggi
f98fbb710b Merge "Restrict line count for BigTextStyle" into lmp-dev 2014-09-08 19:46:45 +00:00
George Mount
da8ec6f42b am d5f92cb6: am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 
* commit 'd5f92cb668532757e06258918fa184703f96c809':
  Use Alpha instead of TransitionAlpha for Activity Transitions.
 2014-09-08 18:59:33 +00:00
Kenny Guy
c2a4060005 Revert "Ensure ApplicationInfo is for correct user for system/android package." 
Cache in ActivityThread means this still doesn't make sure we will
get an ApplicationInfo for the user being requested. So reverting.

This reverts commit 4a3b8aa08d743b28d53b327597abf03a925641f2.

Bug:17002733
Change-Id: Ie40eb31c4074cea09de3d6a41fe38b14e00eb059
 2014-09-08 18:53:56 +00:00
George Mount
7f03e02dc4 am 055417d3: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 
* commit '055417d3255810a5d940fe5a94b8713906370344':
  Use Alpha instead of TransitionAlpha for Activity Transitions.
 2014-09-08 18:49:27 +00:00
George Mount
214e7ad175 Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev 2014-09-08 18:25:03 +00:00
Nicolas Prevot
7068faf4ce am b329d04e: am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev 
* commit 'b329d04ec7ab0818d9deeb644d363151d278a48d':
  Marking two flags as final.
 2014-09-08 16:33:00 +00:00
Jorim Jaggi
457a10d29c Restrict line count for BigTextStyle 
Also fixes paddings for the first line for InboxStyle notifications.

Bug: 17161340
Change-Id: I00a92f256d9ccad7cfbcecb591e84bb0d68ba635
 2014-09-08 18:31:03 +02:00
Nicolas Prevot
1d793d1e53 am de896104: am 09286405: Merge "Marking two flags as final." into lmp-dev 
* commit 'de89610479d59f55de4ef3cbeca62ec27a1c9031':
  Marking two flags as final.
 2014-09-08 16:23:15 +00:00
Nicolas Prevot
97e75e1da9 Merge "Marking two flags as final." into lmp-dev 2014-09-08 16:06:30 +00:00
Kenny Guy
b7451e4923 am 444c3a9e: am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev 
* commit '444c3a9eb36e5a2fa9e19c0aed2691503ace43e4':
  Ensure ApplicationInfo is for correct user for system/android package.
 2014-09-08 13:57:09 +00:00
Kenny Guy
1cc7212086 am f919288d: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev 
* commit 'f919288dc7c7fc0d7e1897fe107508b46ce5838c':
  Ensure ApplicationInfo is for correct user for system/android package.
 2014-09-08 13:46:36 +00:00
Kenny Guy
6a28a8d55c Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev 2014-09-08 13:25:02 +00:00
Robin Lee
2c22d1920f Merge "Revert DevicePolicyManager PrivateKey APIs" 2014-09-08 11:18:24 +00:00
Nicolas Prevot
86a967312a Marking two flags as final. 
Marking FLAG_PARENT_CAN_ACCESS_MANAGED and FLAG_MANAGED_CAN_ACCESS_PARENT
as final.

BUG:17387998

Change-Id: I1562b8638e7cce5706df4517493d1732f19ece8f
 2014-09-08 12:15:35 +01:00
Amith Yamasani
755d7a5877 am c0c51adc: am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev 
* commit 'c0c51adc77aca5fcdb7cd08f0fa3b73395848eb0':
  Use correct API for badging
 2014-09-07 23:25:20 +00:00
Amith Yamasani
bcc8ac2ce9 am 630dfb41: am 081ba853: Merge "Use correct API for badging" into lmp-dev 
* commit '630dfb410afd44c9db401a1679d12aa1edcfcdea':
  Use correct API for badging
 2014-09-07 23:15:17 +00:00