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

107766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
293665686e am 53009832: am 05caa2a3: Apply scan-always setting to initial wifi state. 
* commit '530098327c19cfa3c31c4eabe316bf36ad4a848c':
  Apply scan-always setting to initial wifi state.
 2013-06-03 08:43:58 -07:00
Robert Greenwalt
530098327c am 05caa2a3: Apply scan-always setting to initial wifi state. 
* commit '05caa2a3de32e54562d1ec3031f73ef5392cfb40':
  Apply scan-always setting to initial wifi state.
 2013-06-03 08:41:48 -07:00
John Spurlock
84a369c33b Fix awkward wording in AppWidgetManager docs. 
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
 2013-06-03 11:38:48 -04:00
John Spurlock
77624cd71f Fix awkward wording in AppWidgetManager docs. 
Change-Id: I6d1e180be666b3d88e88f357e8d79f6bbc0c9857
 2013-06-03 09:47:01 -04:00
The Android Automerger
9c7ee73d9c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-03 05:55:11 -07:00
Mikhail Naganov
d18607980d Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use" 2013-06-03 08:39:44 +00:00
The Android Automerger
327f639336 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:28 -07:00
Robert Greenwalt
05caa2a3de Apply scan-always setting to initial wifi state. 
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.

bug:9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
 2013-06-01 10:59:29 -07:00
Robert Greenwalt
156cf40148 am 66c7bd54: am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev 
* commit '66c7bd54046c567de5e3a4d332987a28ecb78092':
  Remember wifi country that's set before boot
 2013-06-01 09:52:18 -07:00
Dirk Dougherty
eb47aac14c am 0f70bcfc: am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '0f70bcfce3eb291e95e2a70f9d353efa862796da':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 09:52:14 -07:00
Wink Saville
61b7e872bf am ec82a7bd: am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit 'ec82a7bde5970b76f2940db25e35865a23c6ebc2':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 09:52:05 -07:00
Jason Sams
1b1c39d773 am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 
* commit 'd19068a7d28d129f5a1a1be478e972b40cea04eb':
  Fix free after use with createFromBitmapResource
 2013-06-01 09:51:46 -07:00
Baligh Uddin
17b2a01ded am 14fa7fe2: (-s ours) am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '14fa7fe20fbff7cfcc5daf0a1dce74a296fe3f86':
  Import translations. DO NOT MERGE
 2013-06-01 09:51:43 -07:00
Jim Miller
e77737f4cd am 2542fd54: am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 
* commit '2542fd54ac943002cb7537029404dcc80a6491ac':
  Fix keyguard issue where an incoming SMS would switch widget
 2013-06-01 09:51:40 -07:00
Robert Greenwalt
66c7bd5404 am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev 
* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot
 2013-06-01 08:58:16 -07:00
Robert Greenwalt
0161d229fd Merge "Remember wifi country that's set before boot" into jb-mr2-dev 2013-06-01 15:57:12 +00:00
Dirk Dougherty
0f70bcfce3 am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:35:13 -07:00
Dirk Dougherty
8ebfb8c9c3 am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:32:11 -07:00
Dirk Dougherty
fdc0c8618b am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'b18c725442e498a6447de37c3b9428b09837eda9':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:28:48 -07:00
Wink Saville
ec82a7bde5 am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '8ca5d64a39395ef6d9f800e843ef706c7ab8bf51':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:27:41 -07:00
Dirk Dougherty
b18c725442 am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit 'a404a62951ad8a2d657a587feb12780e725296e3':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:26:32 -07:00
Dirk Dougherty
a404a62951 am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '6fe992d88abc1c8c75ede638e6b0d52cd06f098f':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:24:12 -07:00
Jason Sams
d19068a7d2 am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 
* commit '413adc9260d700bd8143950951c4e1ad07cbeddf':
  Fix free after use with createFromBitmapResource
 2013-06-01 08:23:22 -07:00
Baligh Uddin
14fa7fe20f am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d':
  Import translations. DO NOT MERGE
 2013-06-01 08:23:19 -07:00
Jim Miller
2542fd54ac am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 
* commit '00d4c94625226ab325def94e9b82074f39572b43':
  Fix keyguard issue where an incoming SMS would switch widget
 2013-06-01 08:23:17 -07:00
Wink Saville
8ca5d64a39 am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 
* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
  Fixing crash in PhoneNumberUtils getNumberFromIntent
 2013-06-01 08:23:02 -07:00
Dirk Dougherty
6fe992d88a am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 
* commit '4fad5c176a245203c1f8d26397ef6cc838753357':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
 2013-06-01 08:21:25 -07:00
Wink Saville
39136d391a Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent" 2013-06-01 14:09:53 +00:00
Robert Greenwalt
304aad49cd Remember wifi country that's set before boot 
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time.  Remember
and write it on BOOT_COMPLETED

Also, there are permission issues around writing the setting.

bug:9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
 2013-05-31 21:10:15 -07:00
Alan Viverette
20914c6ae9 Merge "Cleaning up AbsListView, fixing annotations and updating API calls." 2013-06-01 01:37:46 +00:00
Alan Viverette
66dbeac0e9 Merge "Split AbsListView.onTouchEvent into multiple methods for readability." 2013-06-01 01:37:01 +00:00
Jeff Brown
f71343ddf0 Fix regression in long-press home behavior on tablets. 
Some config.xml resources have values that vary based on the
configuration.  A previous change caused initialization to
occur at a time when the configuration is was not yet available.
This change fixes the problem.

Bug: 8891502
Change-Id: Ia768dc2308cc6ae5f11812c6bce6a6e116cfd759
 2013-05-31 17:59:11 -07:00
Jason Sams
413adc9260 Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev 2013-06-01 00:54:17 +00:00
Adam Powell
3d6a3800c8 Fix build; update framework tests for WindowManager API change 
Change-Id: I801c455184f2a6771f50e29dc147402db48f9fb7
 2013-05-31 17:39:20 -07:00
Adam Powell
3f7a6935d3 Merge "Fix a bug resolving the correct icon/logo in action bars" 2013-06-01 00:07:05 +00:00
Baligh Uddin
f0308dc8c3 Merge "Import translations. DO NOT MERGE" 2013-05-31 22:32:49 +00:00
Baligh Uddin
06544e8c61 Merge "Import translations. DO NOT MERGE" 2013-05-31 22:30:59 +00:00
Baligh Uddin
51e01f9ec0 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-31 22:30:30 +00:00
Dianne Hackborn
99f414908f Merge "Clean up some temporary allocations." 2013-05-31 22:24:39 +00:00
Adam Powell
04fe6ebb9f Fix a bug resolving the correct icon/logo in action bars 
Remove some abstraction-breaking magic in ActionBarView and replace it
with proper resolution of the icon/logo when creating a window. The
old implementation relied on the ActionBarView's context being an
Activity.

Bug 9171554

Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
 2013-05-31 15:00:24 -07:00
Alan Viverette
8fa327a2fc Cleaning up AbsListView, fixing annotations and updating API calls. 
Change-Id: I87ce7714d0cc9e10a1466f474b828f2a27c57e15
 2013-05-31 14:53:13 -07:00
Jim Miller
00d4c94625 Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev 2013-05-31 21:41:34 +00:00
Andreas Huber
d5f9fa574d Listen for HTTP proxy changes and propagate the information to the media 
framework.

related-to-bug: 8873723

Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
 2013-05-31 21:33:13 +00:00
Alan Viverette
e7f30dc14d Split AbsListView.onTouchEvent into multiple methods for readability. 
Change-Id: Iaa28b70f9d708857e64c3d857c65aa075ab4208a
 2013-05-31 14:14:51 -07:00
Xia Wang
1c6911ac1d Add option to set frequency band 
- The reason to add the test runner is to set frequency band when the runner
  is created which happens before the test activity is actually launch.
  As the test activity will disable/enable wifi when it
  is created, this cycle will ensure the frequency is set successfully.

Change-Id: Ie9de3d8bab3dda7d4bb9ba604ddd5cb33164e397
 2013-05-31 14:10:12 -07:00
Dirk Dougherty
4fad5c176a Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs 2013-05-31 21:08:45 +00:00
Romain Guy
511c369ff9 Merge "Remove MipmapDrawable" 2013-05-31 21:03:39 +00:00
Jason Sams
3ece2f3268 Fix free after use with createFromBitmapResource 
Bug 9227350

Change-Id: Iee7610a9bf3d9d1baf14b968aed2a7d0876d2af7
 2013-05-31 14:01:04 -07:00
kmccormick
39ef2c2e76 am fd04f5e3: am 0dc7891c: am 7356dde4: am a75fb065: am c02821ef: am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit 'fd04f5e31a793e1501b4acce1edb05bfa31b79a1':
  Doc Update: fix host title in main doc.
 2013-05-31 13:48:08 -07:00
kmccormick
fd04f5e31a am 0dc7891c: am 7356dde4: am a75fb065: am c02821ef: am eca01252: am 3886fad5: Merge "Doc Update: fix host title in main doc." into jb-mr1.1-docs 
* commit '0dc7891ccb9698aa5d1f8b40aff797184c0544aa':
  Doc Update: fix host title in main doc.
 2013-05-31 13:45:53 -07:00