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

83080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
7ebe1bfff5 am aa02a15d: am c98db2a7: am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit 'aa02a15d42155161593f177cfeba75763331d08d':
  Adds missing Bluetooth as network type.
 2012-08-08 10:59:46 -07:00
Jean-Baptiste Queru
aa02a15d42 am c98db2a7: am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit 'c98db2a7d1379eacef17029e03f1ff4532f32f0a':
  Adds missing Bluetooth as network type.
 2012-08-08 10:58:15 -07:00
Jean-Baptiste Queru
c98db2a7d1 am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit '425d13a0aeded1f750addb2c64cd693109661415':
  Adds missing Bluetooth as network type.
 2012-08-08 10:55:39 -07:00
Nick Kralevich
9663215edc am ebd997d8: am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev 
* commit 'ebd997d8662e52a64318b1f3c531d61e6e76bfc3':
  Content Providers: change default for android:exported
 2012-08-08 10:54:26 -07:00
Jean-Baptiste Queru
425d13a0ae am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
  Adds missing Bluetooth as network type.
 2012-08-08 10:53:52 -07:00
Nick Kralevich
ebd997d866 am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev 
* commit '9d16c219f1ca0836a832e25a61fcaf9c1d0dd67b':
  Content Providers: change default for android:exported
 2012-08-08 10:51:58 -07:00
Nick Kralevich
9d16c219f1 Merge "Content Providers: change default for android:exported" into jb-mr1-dev 2012-08-08 10:50:05 -07:00
Jean-Baptiste Queru
2278e60c39 Merge "Adds missing Bluetooth as network type." 2012-08-08 10:43:20 -07:00
Dianne Hackborn
128f16cfe0 am 852f06b3: am 53791582: Merge "More mult-user API work." into jb-mr1-dev 
* commit '852f06b3fc84d559c2ff2ede2b8477bfd4c4ffa6':
  More mult-user API work.
 2012-08-08 10:27:38 -07:00
Dianne Hackborn
852f06b3fc am 53791582: Merge "More mult-user API work." into jb-mr1-dev 
* commit '537915828b45693e846a126292e026c5b4f05152':
  More mult-user API work.
 2012-08-08 10:25:32 -07:00
Dianne Hackborn
537915828b Merge "More mult-user API work." into jb-mr1-dev 2012-08-08 10:22:49 -07:00
John Spurlock
6d02584f70 am 62293d8d: am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev 
* commit '62293d8dd6c28688f308f46dc2128f1780213fe0':
  Check the ACTIVATE_ON_DOCK setting in DockObserver.
 2012-08-08 08:52:34 -07:00
Daniel Sandler
12a4dcb0ae am cd500c67: am 5927d957: Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev 
* commit 'cd500c670d440564af1c84c9f5c34ea07823df35':
  Migrate Dreams default settings to DatabaseHelper.
 2012-08-08 08:52:30 -07:00
John Spurlock
62293d8dd6 am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev 
* commit 'ec0feefd4422db1151aee722732d8c9528f6dfa8':
  Check the ACTIVATE_ON_DOCK setting in DockObserver.
 2012-08-08 08:50:43 -07:00
Daniel Sandler
cd500c670d am 5927d957: Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev 
* commit '5927d957ea36744315e958ab4a9a1f095d48721c':
  Migrate Dreams default settings to DatabaseHelper.
 2012-08-08 08:50:39 -07:00
John Spurlock
ec0feefd44 Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev 2012-08-08 08:48:07 -07:00
Daniel Sandler
5927d957ea Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev 2012-08-08 08:47:40 -07:00
John Spurlock
786546eacc Check the ACTIVATE_ON_DOCK setting in DockObserver. 
Otherwise docking the device will always launch a Dream.

Change-Id: I2e74ca62f80d7e386d11c00920a75a5a6e78926c
 2012-08-08 11:40:20 -04:00
The Android Open Source Project
1dbfd7a0f9 am 64fcbb39: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '64fcbb3909ebfc4f3471dd5ed5fc19e2f7bde145':
 2012-08-08 08:18:58 -07:00
The Android Open Source Project
64fcbb3909 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib74e96c283bb7611e3e5c810149731400fda70fd
 2012-08-08 08:16:47 -07:00
The Android Automerger
1070436d3a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-08 06:47:19 -07:00
Daniel Sandler
fdb7c36a10 Migrate Dreams default settings to DatabaseHelper. 
Also switch Dreams on for all charging devices by default.

Change-Id: Iccbcc2906d55214320b2f467e88ba9cb188f4886
 2012-08-08 08:38:48 -04:00
Mikhail Naganov
ce18fd9510 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom." 2012-08-08 02:08:58 -07:00
Mikhail Naganov
c70b1f3bd6 Merge "Remove unused BROWSER_TEXT_SIZE_CHANGE log event." 2012-08-08 02:06:36 -07:00
Mikhail Naganov
449b961740 Merge "Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs." 2012-08-08 02:04:13 -07:00
Mikhail Naganov
65e7ace979 Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs. 
According to CTS tests (WebSettingsTest.testLocalImageLoads),
local images access is allowed regardless of the state of
AllowFileAccessFromFileURLs.

Bug: 5461416

Change-Id: I71f5c38a6b0f3720c8c369c0e19f379c78ace06f
 2012-08-08 10:02:39 +01:00
Matthew Xie
773be0d650 am 693c1dc5: am 1ae86869: Merge "Auto connection/disconnection related changes" into jb-mr1-dev 
* commit '693c1dc5b0c2e0e4e94ef9b923201c7101e6a866':
  Auto connection/disconnection related changes
 2012-08-08 00:36:09 -07:00
Matthew Xie
693c1dc5b0 am 1ae86869: Merge "Auto connection/disconnection related changes" into jb-mr1-dev 
* commit '1ae86869bcc2262b6828102c8a3ee08e68580fa7':
  Auto connection/disconnection related changes
 2012-08-08 00:33:48 -07:00
Matthew Xie
1ae86869bc Merge "Auto connection/disconnection related changes" into jb-mr1-dev 2012-08-08 00:31:53 -07:00
Baligh Uddin
8bba56a0c9 Merge "Import translations. DO NOT MERGE" 2012-08-07 19:31:17 -07:00
Dianne Hackborn
7d19e0242f More mult-user API work. 
- You can now use android:singleUser with receivers and providers.
- New API to send ordered broadcasts as a user.
- New Process.myUserHandle() API.

For now I am trying out "user handle" as the name for the numbers
representing users.

Change-Id: I754c713ab172494bb4251bc7a37a17324a2e235e
 2012-08-07 19:19:22 -07:00
Romain Guy
37d15dff60 am 1ab46154: am 0a332e39: Merge "Draw an empty border around glyphs to avoid sampling issues Bug #6942209" into jb-mr1-dev 
* commit '1ab46154d030ef2a6ee53c1d8067707ca7eebf23':
  Draw an empty border around glyphs to avoid sampling issues Bug #6942209
 2012-08-07 19:17:47 -07:00
Romain Guy
1ab46154d0 am 0a332e39: Merge "Draw an empty border around glyphs to avoid sampling issues Bug #6942209" into jb-mr1-dev 
* commit '0a332e39eba608c33473844dbc205a85eef2ebe6':
  Draw an empty border around glyphs to avoid sampling issues Bug #6942209
 2012-08-07 19:15:03 -07:00
Romain Guy
0a332e39eb Merge "Draw an empty border around glyphs to avoid sampling issues Bug #6942209" into jb-mr1-dev 2012-08-07 19:12:09 -07:00
Romain Guy
33fa1f774c Draw an empty border around glyphs to avoid sampling issues 
Bug #6942209

The font renderer was preserving a 1 px border around each glyph to ensure
bilinear filtering would work nicely. Unfortunately, this border was not
set to 0 when glyphs were added in the cache to replace old evicted glyphs.

Change-Id: Ib85afca7ebad5cb63f960dc0e87ae162333dbfe8
 2012-08-07 19:09:57 -07:00
Adam Powell
e8af49bcc3 am 8aa7f9ad: am 96f1ee98: Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev 
* commit '8aa7f9ada135928a28cae1b47511e5bd20b39536':
  Fix a padding resolution bug for adapter-based views
 2012-08-07 18:07:50 -07:00
Adam Powell
8aa7f9ada1 am 96f1ee98: Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev 
* commit '96f1ee9867f966857c2dbd8cdd168d8fcdf72224':
  Fix a padding resolution bug for adapter-based views
 2012-08-07 18:06:05 -07:00
Adam Powell
96f1ee9867 Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev 2012-08-07 18:04:16 -07:00
Adam Powell
172aa0c924 am 6963f2c3: am 60b645f6: Merge "Fix padding in global actions list item" into jb-mr1-dev 
* commit '6963f2c38c3d1f458e69a5b4390661e03936e267':
  Fix padding in global actions list item
 2012-08-07 17:47:06 -07:00
Adam Powell
6963f2c38c am 60b645f6: Merge "Fix padding in global actions list item" into jb-mr1-dev 
* commit '60b645f6739bd7d744ceab87ea50fe72d52cec8a':
  Fix padding in global actions list item
 2012-08-07 17:45:22 -07:00
Adam Powell
60b645f673 Merge "Fix padding in global actions list item" into jb-mr1-dev 2012-08-07 17:42:41 -07:00
Adam Powell
6571c7896d Fix padding in global actions list item 
Re-align the icon edges with the expected amount of padding in the
long-press power dialog.

Change-Id: I0d2f86447e635d5c339b07c261716e12670dc06d
 2012-08-07 17:39:56 -07:00
Adam Powell
0090f20001 Fix a padding resolution bug for adapter-based views 
If padding has not been resolved by the time measure() is called,
resolve it.

Bug 6938579

Change-Id: Idd3ffa3e4e441cd462d6594b1e20d153d7632994
 2012-08-07 17:16:49 -07:00
Jason Simmons
015009af89 am 54925058: am 336b31c2: Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 
* commit '5492505847a7d2e0a57d06b927f8029aa72fa4aa':
  Add an empty stub status bar service implementation
 2012-08-07 16:24:37 -07:00
Jason Simmons
5492505847 am 336b31c2: Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 
* commit '336b31c28ab282595fbf649eaf053f0811034dd9':
  Add an empty stub status bar service implementation
 2012-08-07 16:18:02 -07:00
Jason Simmons
336b31c28a Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 2012-08-07 16:14:50 -07:00
Mike Lockwood
a3a7114daf am c8bcceb2: am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 
* commit 'c8bcceb29eb6832b2f8306a8b5da41e9cda75801':
  MediaFile: Fix case sensitive file extension matching for computing MTP format code
 2012-08-07 15:38:32 -07:00
Mike Lockwood
c8bcceb29e am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 
* commit '08fe2687aae986b7aca5192c60605edebaa18ab8':
  MediaFile: Fix case sensitive file extension matching for computing MTP format code
 2012-08-07 15:36:53 -07:00
Mike Lockwood
08fe2687aa Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 2012-08-07 15:34:49 -07:00
The Android Open Source Project
23b9037f8b am 5783b5de: (-s ours) am c452e025: am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '5783b5dea4b527a1def47445327745d674dee99b':
 2012-08-07 15:23:04 -07:00