drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,803 Commits 1 Branch 0 Tags
Commit Graph

86803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
6625f4dfd9 am 3034558e: am 68d78978: Merge "Fix build - current.txt regenerated" into jb-mr1-dev 
* commit '3034558ec5dea4314812f76924ba8cd1a3dfc3a6':
  Fix build - current.txt regenerated
 2012-09-18 00:10:34 -07:00
Amith Yamasani
5d6d74202f am a6760474: am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'a6760474f751a1b9659f7a932a8debb09068fbe9':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-18 00:10:31 -07:00
Jim Miller
b7555d8e94 am 433e0b2e: am 931be0ee: Merge "Don\'t show empty widget in the case where a widget can\'t be inflated" into jb-mr1-dev 
* commit '433e0b2ee9bd424befd3222b7151f5b438e4c130':
  Don't show empty widget in the case where a widget can't be inflated
 2012-09-18 00:10:27 -07:00
Irfan Sheriff
ed9f9f2569 am caef59af: am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit 'caef59afdda60b5d16a74fffdb98947b1e56fdb1':
  Disable notification scans when p2p is connected
 2012-09-18 00:10:23 -07:00
Dave Burke
ff4dccbe94 am 3d41de1e: am 34436026: Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev 
* commit '3d41de1e172311066805186bcb80fc5e52fd7fab':
  Revert "Increase idle time out to 25s"
 2012-09-18 00:10:20 -07:00
Dave Burke
054e3a1aa6 am 08980a1f: am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 
* commit '08980a1f902a4ac8d485df91f8186598fc49043a':
  Revert "Specify max go intent for wifi display"
 2012-09-18 00:10:16 -07:00
Dianne Hackborn
03f2abecae am 596115b1: am c535d2f3: Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 
* commit '596115b132c9c84f45088cc3cbd5aba9abe3c678':
  Fix dumb bug merging receivers for multiple users.
 2012-09-18 00:10:12 -07:00
Eric Laurent
b653ec8388 am c250e1ed: am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit 'c250e1ed699864462ed1ace5dea22e09f117515b':
  Update headphone volume safety warning message.
 2012-09-18 00:10:08 -07:00
Dianne Hackborn
fb67743848 am 20f8c730: am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit '20f8c730a4d83a01ac92fc3f82129d523b4bc3ef':
  Fix API review bugs.
 2012-09-18 00:10:04 -07:00
Romain Guy
524a6d9cdf am 41dbb6fe: am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '41dbb6fe3545b986c4587a29da7db398c21e3f82':
  Add extra EGL error checking
 2012-09-18 00:10:01 -07:00
Michael Jurka
3e98a33122 am 8075d7fa: am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '8075d7fa62c65fec67c80c0b451be1e051fa568a':
  Fixing construction of handler in AppWidgetHost
 2012-09-18 00:09:57 -07:00
Irfan Sheriff
e1d624017c am e8d79c87: am 218e2f19: Merge "Specify max go intent for wifi display" into jb-mr1-dev 
* commit 'e8d79c87c23845ad0a13dff999a9429e4197544b':
  Specify max go intent for wifi display
 2012-09-18 00:09:54 -07:00
Christopher Tate
012bdf5406 am 1c9f740a: am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit '1c9f740adbee3ddcfd163ea030415630f277c950':
  Per-user content observer APIs
 2012-09-18 00:09:50 -07:00
Irfan Sheriff
1ab1e3279d am 3323b6e6: am ca28410f: Merge "Increase idle time out to 25s" into jb-mr1-dev 
* commit '3323b6e66aa149c75e6e9c22659ddc38f288d41b':
  Increase idle time out to 25s
 2012-09-18 00:09:46 -07:00
Adam Powell
f307cb23f0 am 52761d23: am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '52761d23b0b344778ae9791515c11da4d25e17e8':
  TaskStackBuilder correctness fixes
 2012-09-18 00:09:42 -07:00
Chet Haase
a96461b529 am 21af425b: am a8a402f8: Merge "Fix bad shader code" into jb-mr1-dev 
* commit '21af425b4f781a54bf3f12abf3802b2b3ba57141':
  Fix bad shader code
 2012-09-18 00:09:39 -07:00
Maxim Siniavine
2ab57559cc am 7c6442ff: am 04d5b9fb: Merge "Go to home screen after launching each app." into jb-mr1-dev 
* commit '7c6442ff062b2a35e5473b2b6c9e2e0ab002356a':
  Go to home screen after launching each app.
 2012-09-18 00:09:35 -07:00
Dianne Hackborn
560f555c43 am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit 'c0b590932d611e842836d1662a4baa4812d07b21':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:09:31 -07:00
Amith Yamasani
3034558ec5 am 68d78978: Merge "Fix build - current.txt regenerated" into jb-mr1-dev 
* commit '68d789782b706b0828acfc2cd45d410d2f7d590a':
  Fix build - current.txt regenerated
 2012-09-18 00:05:27 -07:00
Amith Yamasani
a6760474f7 am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'f7a6dfcafc1eaa8014b4fa796e4b31208f72fd36':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-18 00:05:20 -07:00
Jim Miller
433e0b2ee9 am 931be0ee: Merge "Don\'t show empty widget in the case where a widget can\'t be inflated" into jb-mr1-dev 
* commit '931be0ee0cc5e6e762336429bf23640c6e71b936':
  Don't show empty widget in the case where a widget can't be inflated
 2012-09-18 00:05:14 -07:00
Irfan Sheriff
caef59afdd am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit '5bc09e2683202856d2a1ee50c93965895c2e6a2e':
  Disable notification scans when p2p is connected
 2012-09-18 00:04:42 -07:00
Dave Burke
3d41de1e17 am 34436026: Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev 
* commit '3443602665f7306195893cead39855cb890f385b':
  Revert "Increase idle time out to 25s"
 2012-09-18 00:04:36 -07:00
Dave Burke
08980a1f90 am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 
* commit '049dd8e6a3815519062902cc6b6f91940c54d5ea':
  Revert "Specify max go intent for wifi display"
 2012-09-18 00:04:31 -07:00
Dianne Hackborn
596115b132 am c535d2f3: Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 
* commit 'c535d2f30efff83b93094bbc642d59d8225dcc18':
  Fix dumb bug merging receivers for multiple users.
 2012-09-18 00:04:27 -07:00
Eric Laurent
c250e1ed69 am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit '21dfd7c5fe9e42d2ef3ac7423065c86dfe8f29da':
  Update headphone volume safety warning message.
 2012-09-18 00:04:21 -07:00
Dianne Hackborn
20f8c730a4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
 2012-09-18 00:04:17 -07:00
Romain Guy
41dbb6fe35 am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '82f385a372329b767876ace2b3715a2d8ec13221':
  Add extra EGL error checking
 2012-09-18 00:04:12 -07:00
Michael Jurka
8075d7fa62 am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '2bb25cd57ae540160fa2fff2b929b68c448423a9':
  Fixing construction of handler in AppWidgetHost
 2012-09-18 00:04:08 -07:00
Irfan Sheriff
e8d79c87c2 am 218e2f19: Merge "Specify max go intent for wifi display" into jb-mr1-dev 
* commit '218e2f199b9ba568a815d64269ea0784e2d32935':
  Specify max go intent for wifi display
 2012-09-18 00:04:03 -07:00
Christopher Tate
1c9f740adb am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit 'f1aa107b183189d65315d152148dc96b48f6e4b0':
  Per-user content observer APIs
 2012-09-18 00:03:57 -07:00
Irfan Sheriff
3323b6e66a am ca28410f: Merge "Increase idle time out to 25s" into jb-mr1-dev 
* commit 'ca28410f0d17f2ea0bd3455f9d21898c0790b301':
  Increase idle time out to 25s
 2012-09-18 00:03:53 -07:00
Adam Powell
52761d23b0 am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '49a22f2969df6e4f53653d16400268e8d06aa1c2':
  TaskStackBuilder correctness fixes
 2012-09-18 00:03:49 -07:00
Chet Haase
21af425b4f am a8a402f8: Merge "Fix bad shader code" into jb-mr1-dev 
* commit 'a8a402f8ad1549e23f4238786269bd548b6b445d':
  Fix bad shader code
 2012-09-18 00:03:45 -07:00
Maxim Siniavine
7c6442ff06 am 04d5b9fb: Merge "Go to home screen after launching each app." into jb-mr1-dev 
* commit '04d5b9fbd1f9b8c7fa4af402166028c685574d62':
  Go to home screen after launching each app.
 2012-09-18 00:03:32 -07:00
Dianne Hackborn
c0b590932d am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit '4246f695f44386ce74d94f5be73cde409dc2dd12':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:03:28 -07:00
Amith Yamasani
68d789782b Merge "Fix build - current.txt regenerated" into jb-mr1-dev 2012-09-17 23:26:30 -07:00
Amith Yamasani
d6c1cc4a9d Fix build - current.txt regenerated 
Change-Id: I3d6e96f8144522f0b4fafcf9836f58f149866550
 2012-09-17 23:24:38 -07:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Jim Miller
931be0ee0c Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev 2012-09-17 22:30:27 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager 
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
 2012-09-17 21:46:51 -07:00
Irfan Sheriff
5bc09e2683 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 2012-09-17 20:58:42 -07:00
Jim Miller
99a3cae55b Don't show empty widget in the case where a widget can't be inflated 
If the use deletes the widget by disabling a package or removing it,
we used to show a placeholder widget.  Now it skips the widget if it's
not available.

Change-Id: I8582139bf982e41f3f16b5c002e248c5717290aa
 2012-09-17 20:53:51 -07:00
Irfan Sheriff
3809f500c3 Disable notification scans when p2p is connected 
Also reduce scan interval for STA scans to one minute.

Bug: 7138968
Change-Id: I03620f6d462e4ec90d9bb25bbfe709f63173df21
 2012-09-17 20:52:23 -07:00
Dave Burke
3443602665 Merge "Revert "Increase idle time out to 25s"" into jb-mr1-dev 2012-09-17 18:59:50 -07:00
Dave Burke
049dd8e6a3 Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 2012-09-17 18:58:11 -07:00
Dave Burke
ee261a5a6c Revert "Specify max go intent for wifi display" 
This reverts commit 7ab7260697de617aced0b0ba594304a42e5395bd

Change-Id: I5b322f41729695465b164e1dfe6d4b1902cd8117
 2012-09-17 18:56:19 -07:00
Dave Burke
aba79026f2 Revert "Increase idle time out to 25s" 
This reverts commit 968df85b8e9121120a0709f8fa36cc4d700ffd79

Change-Id: Ia00281d45d2a111f37169b38e8bdc6fa595b8638
 2012-09-17 18:55:28 -07:00
Dianne Hackborn
c535d2f30e Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 2012-09-17 18:52:30 -07:00
Dianne Hackborn
6cbd33fc25 Fix dumb bug merging receivers for multiple users. 
Also clean up some debug output.

Change-Id: Ib19e47682e9ddfc6a234bd61d054275a362d28cc
 2012-09-17 18:43:00 -07:00