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

84946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
6c47d0a9ff am ada4f081: am 61d85c43: add link to device dock lesson 
* commit 'ada4f081c641b09f7e3a3c214db868f24df957e9':
  add link to device dock lesson
 2012-09-18 10:45:07 -07:00
Dirk Dougherty
880051db77 am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights. 
* commit '2dec992884db8ca54ee814b4c7967c358dcd8212':
  Doc change: fix typo in JB highlights.
 2012-09-18 10:45:04 -07:00
Scott Main
08ec998bb3 am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit 'a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
  docs: update for multi apk doc for ABI support
 2012-09-18 10:45:00 -07:00
Katie McCormick
0a94b84def am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '917d45e3d1a2d405aa0996889c40554b4a508fe1':
  Doc update: Appwidgets JB additions.
 2012-09-18 10:44:57 -07:00
Scott Main
21c5007ed4 am 8a80ac46: am 54efa69f: older not lower 
* commit '8a80ac469050135ce2c126bc690e352522b7cee3':
  older not lower
 2012-09-18 10:44:53 -07:00
Joe Fernandez
77ae2e6f27 am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 10:44:50 -07:00
Scott Main
db6313ceba am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 10:44:46 -07:00
Katie McCormick
f5c717a96c am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit '2141c06849cb5b2f5bea06a79de66b7de4112ac9':
  Doc update: Fix typo.
 2012-09-18 10:44:42 -07:00
Scott Main
5c97d966cc am 9ae01846: fix broken link for action bar pack 
* commit '9ae018462a5fa44e3e1d4837942b5fd880531124':
  fix broken link for action bar pack
 2012-09-18 10:44:32 -07:00
Adam Powell
fea6a7597f am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'a4b0e5590dc303df68256254f732ef632e6912f3':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:44:24 -07:00
Jean-Baptiste Queru
46acbb6140 am 45291466: am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony 
* commit '4529146642f32c645f9d1be81e9527991e3fd932':
  Show plmn in emergency call allowed mode.
 2012-09-18 10:44:21 -07:00
Marco Nelissen
076814fde3 am c5a6cdeb: Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev 
* commit 'c5a6cdeb14c5112e9c418fe7bf4a3c15740629e4':
  Visualizer only works on sounds >5 sec.
 2012-09-18 10:44:02 -07:00
Mike Lockwood
1e86994cd0 Merge "MtpData bmp format file can't recognize when copy bmp into DUT" 2012-09-18 10:25:42 -07:00
Adam Powell
a4b0e5590d Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 2012-09-18 10:25:00 -07:00
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
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