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

84985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
8b1821979b Use a larger scaling span for larger screen devices. 
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
 2012-09-18 10:23:43 -07:00
Jean-Baptiste Queru
4529146642 am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony 
* commit '7f5de0161b4df9fc8ed817b10a258668ec7513a2':
  Show plmn in emergency call allowed mode.
 2012-09-18 10:07:09 -07:00
Andy McFadden
e8792ce854 am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 
* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
  Plumb display name into SurfaceFlinger
 2012-09-18 10:03:55 -07:00
Nick Kralevich
1273f64d1a am 96b6cf9e: Merge "Adjust FAQ." into jb-mr1-dev 
* commit '96b6cf9eb0dd3a33d332c48c7900b60d38f4eef5':
  Adjust FAQ.
 2012-09-18 10:03:46 -07:00
Marco Nelissen
fa422b0dd6 am 4dff2ab5: Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 
* commit '4dff2ab52bb36f532954a5fc92df1b524e067a82':
  Activity.onStop(Bundle) does not exist
 2012-09-18 10:03:36 -07:00
Marco Nelissen
c5a6cdeb14 Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 2012-09-18 09:44:56 -07:00
Andy McFadden
923c18b142 Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 2012-09-18 09:23:30 -07:00
Nick Kralevich
96b6cf9eb0 Merge "Adjust FAQ." into jb-mr1-dev 2012-09-18 09:22:00 -07:00
Marco Nelissen
af68e7c5f5 Visualizer only works on sounds >5 sec. 
Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file  to be longer
than 5 seconds.
b/4571740
b/7173543
b/7173545
b/7175623

Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
 2012-09-18 09:19:55 -07:00
Jean-Baptiste Queru
7f5de0161b Skip f5cbd762 - it's in frameworks/opt/telephony 
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
 2012-09-18 08:01:17 -07:00
Marco Nelissen
4dff2ab52b Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev 2012-09-18 07:58:37 -07:00
Amith Yamasani
ffe2d3516f am 68d78978: Merge "Fix build - current.txt regenerated" into jb-mr1-dev 
* commit '68d789782b706b0828acfc2cd45d410d2f7d590a':
  Fix build - current.txt regenerated
 2012-09-17 23:29:22 -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
7d43c417b6 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-17 22:54:56 -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
d0a7c6b7be 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-17 22:33:31 -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
Scott Main
edf0ba6e1b am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit '442040208cba3be464d7a180283d72d9ec074def':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-17 21:30:16 -07:00
Scott Main
442040208c cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 
new Google Play badges and some updates to corresponding pages

Change-Id: I8502a47b9d79d9a03a51c7baaacaa454fd63e5a5
 2012-09-17 21:28:14 -07:00
Irfan Sheriff
196813cf9f 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-17 21:03:24 -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
Geremy Condra
9b2c77621a Merge "DO NOT MERGE Added event logging for config installation failures." into jb-mr1-aah-dev 2012-09-17 20:09:56 -07:00
Dave Burke
f58e1154ac 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-17 19:04:09 -07:00
Dave Burke
43a104e54d 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-17 19:02:28 -07:00
Jamie Gennis
917a3b34a3 SurfaceTexture: remove call to doGLFenceWait 
This call is no longer needed as the default behavior of the native
SurfaceTexture class is to do the wait whenever updateTexImage is called.

Change-Id: I995686a5989409e21b00fac913bd33c11f806998
 2012-09-17 19:00:19 -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
Dianne Hackborn
b34b1d5ddd 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-17 18:57:06 -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
Andy McFadden
3bcbad7bcb Plumb display name into SurfaceFlinger 
Pass the display name into SF's createDisplay().

Bug 7058158

Change-Id: Ia21f07063db2c2fb5a34d6526e16d4b2d3694377
 2012-09-17 18:32:40 -07:00
Eric Laurent
a3a58ff13a am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit '21dfd7c5fe9e42d2ef3ac7423065c86dfe8f29da':
  Update headphone volume safety warning message.
 2012-09-17 18:30:54 -07:00
Eric Laurent
21dfd7c5fe Merge "Update headphone volume safety warning message." into jb-mr1-dev 2012-09-17 18:29:27 -07:00
Dianne Hackborn
d2011dcdc4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
 2012-09-17 18:25:00 -07:00
Geremy Condra
6180dee0ed DO NOT MERGE Added event logging for config installation failures. 
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.

Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65

Conflicts:

	services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java
 2012-09-17 18:24:36 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Romain Guy
79990bf8cf am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '82f385a372329b767876ace2b3715a2d8ec13221':
  Add extra EGL error checking
 2012-09-17 18:22:33 -07:00
Romain Guy
82f385a372 Merge "Add extra EGL error checking" into jb-mr1-dev 2012-09-17 18:20:55 -07:00
Romain Guy
740ee65d46 Add extra EGL error checking 
Change-Id: I7cacef41ed08118c5eecf674e3d8461473692968
 2012-09-17 18:11:40 -07:00
Michael Jurka
94671c315d am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '2bb25cd57ae540160fa2fff2b929b68c448423a9':
  Fixing construction of handler in AppWidgetHost
 2012-09-17 18:04:55 -07:00
Michael Jurka
2bb25cd57a Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 2012-09-17 18:03:06 -07:00
Irfan Sheriff
efa2d9d46f 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-17 17:41:13 -07:00
Irfan Sheriff
218e2f199b Merge "Specify max go intent for wifi display" into jb-mr1-dev 2012-09-17 17:37:48 -07:00
Christopher Tate
d384c507ac am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit 'f1aa107b183189d65315d152148dc96b48f6e4b0':
  Per-user content observer APIs
 2012-09-17 17:36:08 -07:00