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

82425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
82b25f54ba Fix bug 6906134 
Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
 2012-07-31 13:12:31 -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
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
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
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
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
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
James Dong
b10ec1f4b1 Fix a typo (dependant => dependent) 
Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
 2012-07-30 15:45:50 -07:00
Ying Wang
6395422929 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-07-30 15:01:31 -07:00
The Android Open Source Project
dc7d462741 am 2606fc48: Reconcile with jb-mr0-release jb-release 
* commit '2606fc48cb2e65489056096227430b054c558767':
  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 14:47:47 -07:00
The Android Open Source Project
2606fc48cb Reconcile with jb-mr0-release jb-release 
Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6
 2012-07-30 14:43:53 -07:00
Peter Ng
a1f89c7b34 am a3b69d1f: am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit 'a3b69d1fa473460b8955fb28e4a1a7621ddd5947':
  copy and image updates to patterns and building blocks
 2012-07-30 14:41:24 -07:00
Fabrice Di Meglio
3330ae59ff Merge "Improve Toast RTL support" into jb-mr1-dev 2012-07-30 14:40:32 -07:00
Peter Ng
a3b69d1fa4 am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev 
* commit '81a9bece12ef855092b27c33a997f3fa7b7f2d98':
  copy and image updates to patterns and building blocks
 2012-07-30 14:39:54 -07:00
Adam Powell
859a62ce92 Merge "Enforce a maximum size for action button icons." into jb-mr1-dev 2012-07-30 14:37:46 -07:00
Peter Ng
81a9bece12 Merge "copy and image updates to patterns and building blocks" into jb-dev 2012-07-30 14:37:26 -07:00
Adam Powell
c0047d4e11 Enforce a maximum size for action button icons. 
Change-Id: Id9b5c1573cd40012229921fa8497cbe5ce340b1e
 2012-07-30 14:30:51 -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
7267babae3 Merge "Enabled application using VideoView to get information events from MediaPlayer" into jb-mr1-dev 2012-07-30 13:37:08 -07:00
Adam Powell
e72a6e977b am fc92eb94: am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit 'fc92eb94c413ebae1016d10460ee62e92f0c1a64':
  Fix preload classname for phone policy.
 2012-07-30 13:13:22 -07:00
Adam Powell
fc92eb94c4 am 2ffb1acb: Merge " Fix preload classname for phone policy." 
* commit '2ffb1acbb704fa9d87fe496d5b7f3053e02799df':
  Fix preload classname for phone policy.
 2012-07-30 13:10:06 -07:00
Ying Wang
2d6cc0968e Import translations. DO NOT MERGE 
Change-Id: Ic5a1446767d3a1e29bd62eeb080215a73a0728c0
Auto-generated-cl: translation import
 2012-07-30 12:15:36 -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
Adam Powell
2ffb1acbb7 Merge " Fix preload classname for phone policy." 2012-07-30 10:46:12 -07:00
The Android Automerger
7a714f11f9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-07-30 09:46:04 -07:00
The Android Automerger
27716fdc3d merge in jb-mr1-release history after reset to master 2012-07-30 07:12:20 -07: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
d3d62f2d06 am fa14d824: Merge "Move and rename user activity event type constants." into jb-mr1-dev 
* commit 'fa14d824d235c33b137a429c3eb6818f273407ab':
  Move and rename user activity event type constants.
 2012-07-27 18:25:27 -07:00
Jeff Brown
006ba8a226 am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev 
* commit 'af3fb2325ef43450916882d85928abc5e474133f':
  Flatten power manager wake lock constants.
 2012-07-27 18:23:44 -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
Jeff Brown
ba8d91670c am e288e180: Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev 
* commit 'e288e180bb22ed14b6b55f7299af66a5a98106c8':
  Implement equals() and hashCode() like a good little object.
 2012-07-27 18:21:03 -07:00