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

105098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
25f6f4f5d0 am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev 
* commit '3c1ad55fcfa54c2c30073d07917da699d156dc58':
  Update Canvas.getClipBounds to not account for AA clips.
 2013-05-17 14:12:43 -07:00
Romain Guy
3c1ad55fcf Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev 2013-05-17 21:10:22 +00:00
Dianne Hackborn
46449b8bbc am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev 
* commit 'd31db759cba78447ba1f4286a84c27a30a5aeb5c':
  Fix issue #9000597: PackageManager get NPE while running performance plan
 2013-05-17 13:34:30 -07:00
Dianne Hackborn
d31db759cb Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev 2013-05-17 20:31:44 +00:00
The Android Open Source Project
b466749787 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa
 2013-05-17 12:54:33 -07:00
Jeff Brown
b7871af2fb am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.
 2013-05-17 12:44:37 -07:00
Jeff Brown
50ab525af6 Merge "Add route description API." into jb-mr2-dev 2013-05-17 19:41:11 +00:00
Baligh Uddin
d29accc699 am 9cd4e67e: Import translations. DO NOT MERGE 
* commit '9cd4e67e10f86710734db5e2e8659e1346f3c041':
  Import translations. DO NOT MERGE
 2013-05-17 12:09:28 -07:00
Dianne Hackborn
2c44c74b88 Fix issue #9000597: PackageManager get NPE while running performance plan 
Change-Id: I2bf777e8b15704d21320f95059d94648122396a8
 2013-05-17 12:07:21 -07:00
Baligh Uddin
9cd4e67e10 Import translations. DO NOT MERGE 
Change-Id: I842a1c08ad79a01566a9abc1a9893ff3f0547846
Auto-generated-cl: translation import
 2013-05-17 10:13:15 -07:00
Scott Main
d2f5f21aea am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page 
* commit 'ecd3f2d729188a869c3dfa771ba050e4caaf0dbb':
  add info about Windows issue and link to issues page
 2013-05-16 20:45:47 -07:00
Scott Main
ecd3f2d729 am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page 
* commit 'eec9bc2f567f037225e9bea1d0facebeb98a183d':
  add info about Windows issue and link to issues page
 2013-05-16 18:07:22 -07:00
Scott Main
eec9bc2f56 am ec5c93e0: am df82d256: add info about Windows issue and link to issues page 
* commit 'ec5c93e0ecd92223a20c049b03f183c588391592':
  add info about Windows issue and link to issues page
 2013-05-16 18:05:13 -07:00
Scott Main
ec5c93e0ec am df82d256: add info about Windows issue and link to issues page 
* commit 'df82d256592d6743e400ccf1c82822ddb56fefbe':
  add info about Windows issue and link to issues page
 2013-05-16 18:03:12 -07:00
Scott Main
df82d25659 add info about Windows issue and link to issues page 
Change-Id: I07f1962fd00fc87c783e090f3e6986449f7b6f7c
 2013-05-16 18:00:02 -07:00
Robert Greenwalt
ae01017f4d Add min delay between disable and enable of wifi 
We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1
 2013-05-16 15:28:59 -07:00
Scott Main
55e150a513 am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip 
* commit '03fe26d5b151bc9ad1c6913edb618e666b1c9b89':
  add nav drawer icon zip
 2013-05-16 15:14:09 -07:00
Scott Main
03fe26d5b1 am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip 
* commit 'd708802698baea82136c12e8a4cee805ab0b3efb':
  add nav drawer icon zip
 2013-05-16 15:12:11 -07:00
Scott Main
d708802698 am 26ab3060: am c452f1e2: add nav drawer icon zip 
* commit '26ab3060ad402204c8a50e184c3947a897667642':
  add nav drawer icon zip
 2013-05-16 15:09:40 -07:00
Scott Main
26ab3060ad am c452f1e2: add nav drawer icon zip 
* commit 'c452f1e251ca7aa26a2cfbb04e2f1086f18ca5df':
  add nav drawer icon zip
 2013-05-16 15:07:46 -07:00
Scott Main
c452f1e251 add nav drawer icon zip 
Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029
 2013-05-16 15:02:02 -07:00
Jeff Brown
56d4b744b3 Add route description API. 
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
 2013-05-16 14:41:30 -07:00
Robert Greenwalt
0643386128 am c12783a9: Add min delay between disable and enable of wifi 
* commit 'c12783a90e08bd2e20eb75f68192fbf7bad80357':
  Add min delay between disable and enable of wifi
 2013-05-16 14:02:49 -07:00
Robert Greenwalt
c12783a90e Add min delay between disable and enable of wifi 
We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1
 2013-05-16 20:57:52 +00:00
John Spurlock
0c8dcf4dcf am c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev 
* commit 'c037282c1ca0d7589168c73f1cf8b19ecc3ffca4':
  Rebind notification listeners for current user.
 2013-05-16 11:09:15 -07:00
John Spurlock
c037282c1c Merge "Rebind notification listeners for current user." into jb-mr2-dev 2013-05-16 18:06:36 +00:00
Scott Main
f799e1f7fa am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons 
* commit '15e102cf3b425484ca4eaf4d8bdab93c30d46f59':
  add links to nav drawer icons
 2013-05-16 10:57:20 -07:00
Scott Main
15e102cf3b am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons 
* commit '6658de781b3826513f26383f261ad18d4cd096da':
  add links to nav drawer icons
 2013-05-16 10:55:10 -07:00
Scott Main
6658de781b am 14f1a995: am 67823512: add links to nav drawer icons 
* commit '14f1a9959311258eea47d1fd1c30b82ceddc9808':
  add links to nav drawer icons
 2013-05-16 10:52:04 -07:00
Scott Main
14f1a99593 am 67823512: add links to nav drawer icons 
* commit '678235122bb61304a36731e7a4ab1f4ad666980f':
  add links to nav drawer icons
 2013-05-16 10:50:13 -07:00
Scott Main
678235122b add links to nav drawer icons 
Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5
 2013-05-16 10:47:12 -07:00
John Spurlock
3ec4e7050a Rebind notification listeners for current user. 
Use ForUser overload when reading setting inside system server.

Bug: 9000206
Change-Id: Ie87aed578d29425d8f32b23aeb8aa7118922c889
 2013-05-16 13:42:38 -04:00
John Huang
f6690e3dd6 am 82040986: Merge "Premium SMS popup for ISIS" 
* commit '82040986598b848830b00a068cf80c228957e173':
  Premium SMS popup for ISIS
 2013-05-16 08:47:19 -07:00
Dirk Dougherty
8c0eb22d6e am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 
* commit '02ea97b592f453e1faf591acafe374bca74d0de4':
  Doc change: change contact form for optimization tips review decisions.
 2013-05-16 08:25:52 -07:00
Dirk Dougherty
02ea97b592 am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 
* commit 'f7089ab0062b3db9858012330501cedcab3739cd':
  Doc change: change contact form for optimization tips review decisions.
 2013-05-16 08:24:02 -07:00
Derek Sollenberger
00a33a8ce8 Update Canvas.getClipBounds to not account for AA clips. 
This preserves the existing behavior at the SDK level while skia
investigates a more comprehensive solution.

bug: 8986473
Change-Id: Ief82dcfd47f1ba08d28d43402b3c28694f94f2e4
 2013-05-16 09:31:27 -04:00
The Android Automerger
fdbc2d03c5 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-16 05:55:35 -07:00
The Android Open Source Project
74dcb8ec60 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1
 2013-05-16 05:43:31 -07:00
Dirk Dougherty
f7089ab006 am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 
* commit 'd73dee305b7b3b75fe2b6d5d4a99e35d65e06f85':
  Doc change: change contact form for optimization tips review decisions.
 2013-05-16 00:35:37 -07:00
Dirk Dougherty
d73dee305b am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 
* commit 'a012887a7856c29e77cd9b08fab16a6c26c93c57':
  Doc change: change contact form for optimization tips review decisions.
 2013-05-16 00:33:29 -07:00
Dirk Dougherty
a012887a78 Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev 2013-05-16 07:31:53 +00:00
Dirk Dougherty
83a5f082f0 Doc change: change contact form for optimization tips review decisions. 
Change-Id: Ib4d5c5d4a5d078fb7b5612d5908515032e69f565
 2013-05-16 00:31:02 -07:00
John Huang
8204098659 Merge "Premium SMS popup for ISIS" 2013-05-16 02:31:43 +00:00
Sangcheol Lee
5e6d85fd3b Premium SMS popup for ISIS 
Premium SMS popup warning during ISIS Wallet activation must be removed

Change-Id: Ib0bd4b1f2ee37abc8becc64e20ae73337f0381aa
 2013-05-15 22:43:37 +00:00
Scott Main
1a87670938 am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class 
* commit '94160cd1d72ee0d74ddd70298811cbe16e2ef0db':
  add tags to lessons in navigation class
 2013-05-15 14:54:11 -07:00
Scott Main
94160cd1d7 am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class 
* commit '93657665845a61ccf33a81e62a922163234b8cb3':
  add tags to lessons in navigation class
 2013-05-15 14:52:39 -07:00
Scott Main
9365766584 am 65b68f4a: am 0c39152f: add tags to lessons in navigation class 
* commit '65b68f4a760dc029805aff5f1fa804a3420ac38c':
  add tags to lessons in navigation class
 2013-05-15 14:50:03 -07:00
Scott Main
65b68f4a76 am 0c39152f: add tags to lessons in navigation class 
* commit '0c39152fc6847c8332aed46fd944579806d583df':
  add tags to lessons in navigation class
 2013-05-15 14:47:44 -07:00
Scott Main
0c39152fc6 add tags to lessons in navigation class 
Change-Id: Icab52c7aa3069b4cf700a9f2bc84a6d833b48621
 2013-05-15 14:39:20 -07:00
Chet Haase
944a8725e6 am bee0495f: Merge "Dirty rect must expand, not contract." into jb-mr2-dev 
* commit 'bee0495fa17b7e385d880f18e510e295c000cfa9':
  Dirty rect must expand, not contract.
 2013-05-15 13:35:09 -07:00