Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,622 Commits 3 Branches 0 Tags
cf737484a83fa5d509417c152e64463d8bffe37e
Commit Graph

24435 Commits

Author SHA1 Message Date
Teng-Hui Zhu
cf737484a8 am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev 
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
  Add license info to the HTML5Video files.
 2012-08-01 14:53:10 -07:00
Dianne Hackborn
7be6374428 am 791039d6: am e6184f83: Merge "Start moving away from DisplayMetrics.DENSITY_DEVICE." into jb-mr1-dev 
* commit '791039d68ce505057bd2c7a730be85b419f6d024':
  Start moving away from DisplayMetrics.DENSITY_DEVICE.
 2012-08-01 14:53:06 -07:00
Teng-Hui Zhu
3a68038249 Merge "Add license info to the HTML5Video files." into jb-mr1-dev 2012-08-01 14:19:46 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files. 
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
 2012-08-01 13:59:39 -07:00
Dianne Hackborn
908aecc3a6 Start moving away from DisplayMetrics.DENSITY_DEVICE. 
This puts in most of the infrastructure needed to allow us to
switch between different densities at run time.  The main remaining
uses of the global are to initialize the Bitmap object (not sure
what to do about that since it doesn't have anything passed in
the constructor to get this information from), and being able to
load drawables if we need a different density than what was preloaded
by zygote.

Change-Id: Ifdbfd6b7a5c59e6aa22e63b95b78d96af3d96848
 2012-08-01 10:54:39 -07:00
Craig Mautner
893eacc591 am 4186f85d: am 28e000ef: Merge "Remove debugging for b6829431." into jb-mr1-dev 
* commit '4186f85ddecc9d95aa130eb10bedbd2ef457c5b0':
  Remove debugging for b6829431.
 2012-08-01 10:29:01 -07:00
Craig Mautner
28e000ef72 Merge "Remove debugging for b6829431." into jb-mr1-dev 2012-08-01 10:04:38 -07:00
Craig Mautner
1c43719c47 Remove debugging for b6829431. 
Change-Id: If7da858722d5d0a5e7db2bc249d454bdee1ec94e
 2012-08-01 10:01:16 -07:00
Dianne Hackborn
d31bf5948f am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev 
* commit '008408277933afb23a95e080b09eed07d2575eda':
  Make AtomicFile a public API.  It's about time!
 2012-07-31 18:15:26 -07:00
Dianne Hackborn
40e5df95ff Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev 2012-07-31 18:11:03 -07:00
Dianne Hackborn
39606a007a Make AtomicFile a public API. It's about time! 
Change-Id: Ib34e294747405b7ab709cb0bbb2d9a0cc80ce86a
 2012-07-31 17:54:52 -07:00
Jeff Sharkey
a50393faf5 am 37f0fbf3: am 24d19fb6: Revert "API to adjust network stats." 
* commit '37f0fbf35260e96cdb699326be63bf19ec4d567d':
  Revert "API to adjust network stats."
 2012-07-31 17:23:00 -07:00
Jeff Sharkey
24d19fb6ab Revert "API to adjust network stats." 2012-07-31 17:11:07 -07:00
Adam Powell
72b7c53c92 am 015b2c1e: am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t scroll." into jb-mr1-dev 
* commit '015b2c1e0b9a9d0b3defb2958931b04386128590':
  Don't let ScrollView intercept touch events if it can't scroll.
 2012-07-31 16:46:01 -07:00
Adam Powell
0278c2fcba Don't let ScrollView intercept touch events if it can't scroll. 
Bug 6872104

Change-Id: Iee643e052acc37485a8ec45b7af8be0783fb1a95
 2012-07-31 16:39:32 -07:00
Fabrice Di Meglio
d8a7893698 am ffbacd8c: am fba3bf97: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit 'ffbacd8ce51544ce45d93e7009487d741569b724':
  Improve Toast RTL support
 2012-07-31 12:30:25 -07:00
Fabrice Di Meglio
fba3bf97d4 Merge "Improve Toast RTL support" into jb-mr1-dev 2012-07-31 12:26:52 -07:00
Jeff Sharkey
16ef577917 Merge "API to adjust network stats. DO NOT MERGE." into jb-mr1-dev 2012-07-31 12:09:54 -07:00
Jeff Sharkey
e7ed1ce4c8 API to adjust network stats. DO NOT MERGE. 
Enables system apps to correctly account network usage performed on
behalf of another application.

Bug: 6695246
Change-Id: I39e243afd57936b6b30157a6ca511a17b6c55c39
 2012-07-31 11:45:17 -07:00
Kenny Root
285345ff5c am a8e77099: am e23ae144: am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'a8e770991e8659d775d97f603e8f1a542aa0229e':
  Delay AccountManagerService initialization
 2012-07-31 11:23:22 -07:00
Kenny Root
e23ae144cc am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'fa74f7e04fcad1258a1b85515547dba0466086d8':
  Delay AccountManagerService initialization
 2012-07-31 11:19:40 -07:00
Kenny Root
fa74f7e04f am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev 
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
  Delay AccountManagerService initialization
 2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e Merge "Delay AccountManagerService initialization" into jb-dev 2012-07-31 11:14:02 -07:00
The Android Open Source Project
0132368c2d Revert "am a21a6075: Reconcile with jb-mr1-release" 
This reverts commit 27a2c84958, reversing
changes made to 905272a439.
 2012-07-31 10:58:38 -07:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:20:25 -07:00
The Android Open Source Project
9ead33be76 am d8d0e2f2: Sync with jb-mr1-dev 
* commit 'd8d0e2f2b572d194b29f4b4f47669854a1c438c4':
  Tentertively enable notification ime switcher
  Doc change: fix title and API level reference.
  actionbar and tabs image updates
  New API level 17 for JB MR1.
  dialog example update
 2012-07-31 08:28:37 -07:00
Mikhail Naganov
f415f3d72b Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." 2012-07-31 05:08:23 -07:00
Fabrice Di Meglio
025f9602ee Improve Toast RTL support 
- simplier code

Change-Id: Ifbe8545697404ed6e9f508103bd9cf1e7efb5746
 2012-07-30 19:00:22 -07:00
Dianne Hackborn
d913cf1859 Merge "New API level 17 for JB MR1." into jb-mr1-dev 2012-07-30 18:34:36 -07:00
Dianne Hackborn
435cdb4604 New API level 17 for JB MR1. 
Change-Id: If71ce3b521fe17578feb5c2a2f7fd65696720554
 2012-07-30 17:37:04 -07:00
Kenny Root
26ff6626fc Delay AccountManagerService initialization 
Since applications can have Account providers, they need to be delayed
until after PackageManagerService says everything is mounted.
Otherwise the accounts associated with that provider will be removed
immediately when startup happens.

Bug: 6820670
Change-Id: Iba81765260421649f706624d0605a40ebc1347b1
 2012-07-30 16:28:44 -07:00
The Android Open Source Project
27a2c84958 am a21a6075: Reconcile with jb-mr1-release 
* commit 'a21a60757d7e589ade83129f42aadc019f1d5aa4':
  Fix permission issues for apps
 2012-07-30 15:10:53 -07:00
Fabrice Di Meglio
b3df96ea21 am 85c1765e: am 3330ae59: Merge "Improve Toast RTL support" into jb-mr1-dev 
* commit '85c1765ea76c06ac7a892086811ec8047e0d8b62':
  Improve Toast RTL support
 2012-07-30 15:10:16 -07:00
Fabrice Di Meglio
3330ae59ff Merge "Improve Toast RTL support" into jb-mr1-dev 2012-07-30 14:40:32 -07:00
Fabrice Di Meglio
bf0bc63def Improve Toast RTL support 
- use Locale from Context

Change-Id: Ic93bb6e3f9310d54d879c20754c9310154940565
 2012-07-30 14:06:58 -07:00
James Dong
34f48b78a3 am 2542d0de: am 7267baba: Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 
* commit '2542d0de1c0a1d304439e8281107694adb2202d4':
  Enabled application using VideoView to get information events from MediaPlayer
 2012-07-30 13:41:35 -07:00
James Dong
7267babae3 Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 2012-07-30 13:37:08 -07:00
Nick Pelly
48c5eb018b DO NOT MERGE. Add package-name-prefix blacklist for location updates. 
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.

Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.

A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.

Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
 2012-07-30 13:17:30 -07:00
Fabrice Di Meglio
cb57869cc3 am e2a7c66d: am 619e4dca: Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 
* commit 'e2a7c66da05411336a8584f177794487ac8cc4c3':
  Improve ListPopupWindow RTL support
 2012-07-30 13:11:58 -07:00
Fabrice Di Meglio
619e4dca8e Merge "Improve ListPopupWindow RTL support" into jb-mr1-dev 2012-07-30 11:29:20 -07:00
Fabrice Di Meglio
1d3d7da331 Improve ListPopupWindow RTL support 
- add Javadoc for new method setLayoutDirection()
- fix one issue where the layout direction would not be set
when the popup was recreated

Change-Id: Ic53a8b0d01dc86e03e9bf5f09195af77404dca39
 2012-07-30 11:27:31 -07:00
Elliott Hughes
776708222a Merge "Fix Time.parse and Time.parse3339 crashing bugs." 2012-07-30 08:03:02 -07:00
Mikhail Naganov
56936a1f51 Deprecate WebSettings.LOAD_NORMAL cache mode. 
After the switch to the Chromium network stack, this setting is
effectively the same as LOAD_DEFAULT, and having two settings
with the same meaning is confusing.

This change is blocking https://android-git.corp.google.com/g/205883 in CTS

Change-Id: I02cc23477f107e7f4cec37dcbad4f25503b5e840
 2012-07-30 14:54:49 +01:00
Mikhail Naganov
ce76ca51d8 Add 'getValue' methods to WebSettings.TextSize and ZoomDensity enums. 
As the 'value' fields in these enums are not public, it isn't possible to
retrieve the enum value if the WebViewProvider implementation is defined in a
different package to the API. Adding public hidden methods to fix this.

Change-Id: Ia5fb1332d0043e127b4bad03a295d8abf1a5e5b9
 2012-07-30 14:20:01 +01:00
Jeff Brown
893717968f am d3d62f2d: am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev 
* commit 'd3d62f2d06652cd311363809b6bb25bf9776d1d3':
  Move and rename user activity event type constants.
 2012-07-27 18:28:10 -07:00
Jeff Brown
66fead4227 am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev 
* commit '006ba8a226236af2189e62a221ae932344b79210':
  Flatten power manager wake lock constants.
 2012-07-27 18:26:27 -07:00
Jeff Brown
4316da201d am ba8d9167: am e288e180: Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev 
* commit 'ba8d91670ce4d3ae3dd52cf51202e40ca603b63d':
  Implement equals() and hashCode() like a good little object.
 2012-07-27 18:23:27 -07:00
Jeff Brown
fa14d824d2 Merge "Move and rename user activity event type constants." into jb-mr1-dev 2012-07-27 18:23:22 -07:00
Jeff Brown
1fd1d493c9 am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev 
* commit '397aca12c9d5ffaddab0fc70a05b8cb443f04a75':
  Fix inconsistency in user activity types.
 2012-07-27 18:21:37 -07:00
Jeff Brown
af3fb2325e Merge "Flatten power manager wake lock constants." into jb-mr1-dev 2012-07-27 18:21:19 -07:00