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

82576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
23e89348ff am f63c7565: (-s ours) am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit 'f63c7565fc0923dce364efc90d60b98c14899c38':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:26:38 -07:00
Nick Pelly
f63c7565fc am 90f51589: am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '90f5158961a8b3bf364273b7d91cb73a4d172c88':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:24:53 -07:00
Nick Pelly
90f5158961 am 5dcbe638: (-s ours) am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 
* commit '5dcbe638ee063201fb476ef475d2beb347f02097':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
 2012-07-31 09:22:46 -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
Nick Pelly
1af5ac1b68 Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 2012-07-31 09:17:54 -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
The Android Open Source Project
d8d0e2f2b5 Sync with jb-mr1-dev 
Change-Id: Ic6ab2992650b6cbe446236c73e6380d20dab003e
 2012-07-31 07:51:39 -07:00
The Android Automerger
ff8e57aaf5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-31 07:35:23 -07:00
Mikhail Naganov
f415f3d72b Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." 2012-07-31 05:08:23 -07:00
James Dong
150275ec72 am d9e72eae: am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 
* commit 'd9e72eaecec9925c142ab5d0a2b90c36655233b5':
  Fix a typo (dependant => dependent)
 2012-07-30 22:31:51 -07:00
James Dong
d9e72eaece am 5eaa5d18: Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 
* commit '5eaa5d18bd0442596d05f6707e4f325c57dfbddc':
  Fix a typo (dependant => dependent)
 2012-07-30 22:25:32 -07:00
Satoshi Kataoka
3185869c65 Merge " Tentertively enable notification ime switcher" into jb-mr1-dev 2012-07-30 20:14:59 -07:00
Satoshi Kataoka
5e445c2e2c Tentertively enable notification ime switcher 
Bug: 6883389

Change-Id: I90d216e0081c5c5b089ab7fe1396ace91f8b4434
 2012-07-31 11:39:51 +09:00
Fabrice Di Meglio
025f9602ee Improve Toast RTL support 
- simplier code

Change-Id: Ifbe8545697404ed6e9f508103bd9cf1e7efb5746
 2012-07-30 19:00:22 -07:00
Brian Carlstrom
5b1f037829 Change KeyStore to use Modified UTF-8 to match NativeCrypto 
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
 2012-07-30 18:54:18 -07:00
Peter Ng
1edd4ae5c4 help image updates 
Change-Id: I4357879eb365f5584efb838139132fd9f7a6e1be
 2012-07-30 18:49:45 -07:00
Peter Ng
0aa01367a0 am 66f13d75: am 28b452fd: Merge "dialog example update" into jb-dev 
* commit '66f13d75107fac3e1f251b65229e6d99d212e380':
  dialog example update
 2012-07-30 18:44:46 -07:00
Peter Ng
a23cd3a3e0 am 581784b3: am a5d92968: Merge "actionbar and tabs image updates" into jb-dev 
* commit '581784b3428b86501533582556772c11efbd6612':
  actionbar and tabs image updates
 2012-07-30 18:44:42 -07:00
Peter Ng
66f13d7510 am 28b452fd: Merge "dialog example update" into jb-dev 
* commit '28b452fddf85de27ad88b2b5de884c8428e74f1e':
  dialog example update
 2012-07-30 18:42:19 -07:00
Peter Ng
581784b342 am a5d92968: Merge "actionbar and tabs image updates" into jb-dev 
* commit 'a5d929681a64fff76dcfc7b0ce3f03666cf98337':
  actionbar and tabs image updates
 2012-07-30 18:42:08 -07:00
Peter Ng
28b452fddf Merge "dialog example update" into jb-dev 2012-07-30 18:39:41 -07:00
Peter Ng
a5d929681a Merge "actionbar and tabs image updates" into jb-dev 2012-07-30 18:39:41 -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
Peter Ng
5ac5a324b3 new accessibility section 
Change-Id: I15fdc9550c9bf414f003685748f5aff71a9b4d44
 2012-07-30 18:34:35 -07:00
Dirk Dougherty
f15c2321dd am 6918de8f: am 27855acc: Doc change: fix title and API level reference. 
* commit '6918de8f81e356fdc6dcd867931a85a69b7d80ac':
  Doc change: fix title and API level reference.
 2012-07-30 18:20:14 -07:00
Dirk Dougherty
6918de8f81 am 27855acc: Doc change: fix title and API level reference. 
* commit '27855accec6557dade0a9cb647a235620881e946':
  Doc change: fix title and API level reference.
 2012-07-30 18:18:32 -07:00
Dirk Dougherty
27855accec Doc change: fix title and API level reference. 
Change-Id: Ib76edbb004ed4af0672f27e1f94dbb73716653a2
 2012-07-30 18:10:08 -07:00
Peter Ng
6443ca4cd9 actionbar and tabs image updates 
Change-Id: I2a0294ddc3627ddc0998de8d415fb938bc6ff86e
 2012-07-30 17:53:32 -07:00
Dianne Hackborn
435cdb4604 New API level 17 for JB MR1. 
Change-Id: If71ce3b521fe17578feb5c2a2f7fd65696720554
 2012-07-30 17:37:04 -07:00
Dianne Hackborn
9ec6cdde9f Optimize memory use of IntentResolver. 
Use raw arrays instead of ArrayList for data structures.

Temporarily includes a copy of the old intent resolver for
validating the new implementation.

Change-Id: I988925669b6686ac73b779be6cd6fe3a9fd86660
 2012-07-30 17:31:19 -07:00
Peter Ng
bdd8d0fada dialog example update 
Change-Id: Ia34dc977559fcd8bf6fe85c60ea0d328ed047e0f
 2012-07-30 17:21:31 -07:00
James Dong
5eaa5d18bd Merge "Fix a typo (dependant => dependent)" into jb-mr1-dev 2012-07-30 16:45:47 -07:00
Jason Sams
41bd3508e7 save 2ms replace div with mul. 
Change-Id: I13d80b074b70cd2edd71f33e2881aa367b7652c7
 2012-07-30 16:41:18 -07:00
Peter Ng
367f55f2da am 3d964c4e: am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '3d964c4ef2a8cac0d36cd3a83fdf4637e5fb724d':
  help, notificaion page updates and typos -changed copy to remove instances of eg
 2012-07-30 16:30:46 -07:00
Peter Ng
3d964c4ef2 am 752281db: am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '752281db5ae02d6ed5b353953a7de9515b1fedbd':
  help, notificaion page updates and typos -changed copy to remove instances of eg
 2012-07-30 16:28:57 -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
Peter Ng
752281db5a am 3074dad2: am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '3074dad2390029db221742f45fe6f7bf40d0069b':
  help, notificaion page updates and typos -changed copy to remove instances of eg
 2012-07-30 16:27:18 -07:00
Peter Ng
3074dad239 am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg 
* commit '8874ab0473f4db10e71bf0537c0703db03bac4ee':
  help, notificaion page updates and typos -changed copy to remove instances of eg
 2012-07-30 16:22:42 -07:00
Peter Ng
8874ab0473 help, notificaion page updates and typos 
-changed copy to remove instances of eg

Change-Id: Ife1da42ffdd25ffbfe23d0315cd27df4c738e182
 2012-07-30 16:08:15 -07:00
Raph Levien
8b4072d3fb Fix bug 6892600 Font (character pairs) rendering issue 
Alignment on paint for actual glyph drawing needs to always be left,
even when drawing centered or right aligned text. The x offset for
alignment is applied by OpenGLRenderer::drawText (and needs to be early
in the pipeline for quickReject to work). Similar change needed for
drawing drop shadow.

Also fixes bug with mispositioned underline (offset for alignment has
already been applied once, no need to do it again in
drawTextDecorations).

Change-Id: Id3dcd62de5536a26b158d768889273a1492b35d6
 2012-07-30 15:53:16 -07:00
James Dong
b10ec1f4b1 Fix a typo (dependant => dependent) 
Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
 2012-07-30 15:45:50 -07:00
Ying Wang
e24a090ec6 am 4522858d: (-s ours) am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '4522858dad073cbf19829d25ecb35e9a54f6fef5':
  Import translations. DO NOT MERGE
 2012-07-30 15:10:57 -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
The Android Open Source Project
905272a439 am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release 
* commit '8f21770cb5439f77422ee70aef4a3691c89f6611':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
 2012-07-30 15:10:27 -07:00
Peter Ng
dcdd257551 am 09f18477: am a1f89c7b: am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit '09f18477e87282068b03301626730310cce636ae':
  copy and image updates to patterns and building blocks
 2012-07-30 15:10:20 -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
Adam Powell
7dd2157ec2 am 2ebfee16: am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev 
* commit '2ebfee16402e9a9ae631fca00806bef9233a6ac0':
  Enforce a maximum size for action button icons.
 2012-07-30 15:10:12 -07:00
Ying Wang
4522858dad am 63954229: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6395422929df024d2bb29a490f9ac17cdb99bfc2':
  Import translations. DO NOT MERGE
 2012-07-30 15:05:08 -07:00
The Android Open Source Project
a21a60757d Reconcile with jb-mr1-release 
Change-Id: Ic5a38ec8411772c4bad01c3431d284d54b3c3d23
 2012-07-30 15:04:13 -07:00
Ying Wang
fdfb676df6 Merge "Import translations. DO NOT MERGE" 2012-07-30 15:02:54 -07:00