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

106876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Satoshi Kataoka
c6f7a7ff88 Merge "A tiny cleanup as the supplement of I9b5ef954479150bc4735 Bug: 3483284 Bug: 8851603" 2013-05-20 21:32:03 +00:00
Alex Klyubin
3f8781d0d7 am 50d3338d: am c8c3c797: am 8cd5592c: am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '50d3338d9ee3fca22a0219038cfe768ca4557110':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:19:55 -07:00
Satoshi Kataoka
12afe1450e A tiny cleanup as the supplement of I9b5ef954479150bc4735 
Bug: 3483284
Bug: 8851603

Change-Id: Ia6dd894dced9cc68c04aafdcae754a404cf52e83
 2013-05-21 06:19:27 +09:00
Alex Klyubin
50d3338d9e am c8c3c797: am 8cd5592c: am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit 'c8c3c797e2f30bf0b71c5acb2521f0f4beef8bf9':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:16:57 -07:00
Alex Klyubin
c8c3c797e2 am 8cd5592c: am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '8cd5592c5fc2d13e7ab60b2cd25dd9cc90e1e124':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:15:17 -07:00
Alex Klyubin
8cd5592c5f am bce05d91: am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit 'bce05d9125d7c9bf536bc6cb1758c7cd3e485166':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:13:19 -07:00
Satoshi Kataoka
f1a6d646a4 Merge "Fix a bug on the focus of the input method switching dialog" 2013-05-20 21:11:47 +00:00
Alex Klyubin
bce05d9125 am 45e56fd5: cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
* commit '45e56fd5e1d3747cc1a9f1ecd5883ee491bff532':
  cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 14:10:39 -07:00
Alex Klyubin
45e56fd5e1 cherypick from mr2: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276 
Switch APK signing from MD5WithRSA to SHA1WithRSA.

While we're at it, remove duplicates of app-signing.jd.

Change-Id: I3b5441bc61107a4f6d9b67366517785e6792cf9e
 2013-05-20 14:05:56 -07:00
Satoshi Kataoka
02679f647b Fix a bug on the focus of the input method switching dialog 
Bug: 8851603
Change-Id: I9b5ef954479150bc47351197c792fb96aba70d01
 2013-05-21 05:59:56 +09:00
Alex Klyubin
8c88cc5c0e am e3441847: am 791d76bb: Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 
* commit 'e34418471e0d91c1b8391246b81466c39823d4ab':
  Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 13:59:28 -07:00
Alex Klyubin
e34418471e am 791d76bb: Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 
* commit '791d76bb3e0a79106adae02139650ff2b56a31e9':
  Switch APK signing from MD5WithRSA to SHA1WithRSA.
 2013-05-20 13:56:44 -07:00
Alex Klyubin
791d76bb3e Merge "Switch APK signing from MD5WithRSA to SHA1WithRSA." into jb-mr2-dev 2013-05-20 20:51:58 +00:00
Alex Klyubin
0aa559b263 Switch APK signing from MD5WithRSA to SHA1WithRSA. 
While we're at it, remove duplicates of app-signing.jd.

Bug: 9000563
Change-Id: Ib7e08e719b6b9c9b1e8116e6e2a77611f046b276
 2013-05-20 13:47:09 -07:00
Chet Haase
4e239aeed3 am e8d6dc4c: am 865cffc7: Merge "Add null check in ViewOverlay" into jb-mr2-dev 
* commit 'e8d6dc4cad65c8c29c365d71d2255eb637581fdb':
  Add null check in ViewOverlay
 2013-05-20 13:44:59 -07:00
Chet Haase
e8d6dc4cad am 865cffc7: Merge "Add null check in ViewOverlay" into jb-mr2-dev 
* commit '865cffc7cece8f10a9e6aab1e89a92c8794cb279':
  Add null check in ViewOverlay
 2013-05-20 13:43:36 -07:00
Chet Haase
865cffc7ce Merge "Add null check in ViewOverlay" into jb-mr2-dev 2013-05-20 20:40:37 +00:00
Craig Mautner
b3b36ba138 Resize all changed windows and fix moveTaskToStack 
- Add all changing windows to mResizingWindows when an ActivityStack
is resized.

- Stop calling TaskStack.setBounds if the bounds haven't changed.

- Make moving a task from one stack to another work properly.

- Eliminate unused methods and redundant variables in WindowState and
WindowStateAnimator.

Change-Id: I3a950c777bcc50cdeced150d44423d4d0b38af4a
 2013-05-20 13:25:14 -07:00
Craig Mautner
f7bfefb598 Reformat wrapped lines and merge sendMessages. 
Change-Id: I2834966196c2e6a778fc0cb71e4a56411b24c3f0
 2013-05-20 13:25:14 -07:00
Baligh Uddin
6dd097cf5f am 13137ea1: (-s ours) am 3ee2977c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '13137ea15d5df67f522a0dbeafd95a05a8b26370':
  Import translations. DO NOT MERGE
 2013-05-20 12:59:19 -07:00
Baligh Uddin
13137ea15d am 3ee2977c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '3ee2977c442beb23c39f7b8deb300625c9f10c1a':
  Import translations. DO NOT MERGE
 2013-05-20 12:54:49 -07:00
Baligh Uddin
a80c7d16be Merge "Import translations. DO NOT MERGE" 2013-05-20 19:53:22 +00:00
Baligh Uddin
3ee2977c44 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-20 19:53:00 +00:00
Scott Main
4f2c268e5e am f3a5682b: am 412633ba: am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f3a5682bbabd4df28f4d410445262afabcff26ee':
  update video playlists and marquee announcements
 2013-05-20 12:38:05 -07:00
Scott Main
f3a5682bba am 412633ba: am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit '412633baa05c7090015c35e0c6645e337cd7cd14':
  update video playlists and marquee announcements
 2013-05-20 12:35:57 -07:00
Scott Main
412633baa0 am 2cca8962: am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit '2cca8962327b2d988bf5172e4142268fa3795b57':
  update video playlists and marquee announcements
 2013-05-20 12:33:00 -07:00
Scott Main
2cca896232 am f657689a: am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f657689ab5b7d46e5f3c9dd376c0cb89479a1075':
  update video playlists and marquee announcements
 2013-05-20 12:30:38 -07:00
Scott Main
f657689ab5 am f943b6de: Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 
* commit 'f943b6def746217db06fc7c33e4d181fc55b87be':
  update video playlists and marquee announcements
 2013-05-20 12:28:54 -07:00
Scott Main
f943b6def7 Merge "update video playlists and marquee announcements" into jb-mr1.1-ub-dev 2013-05-20 19:26:49 +00:00
Scott Main
9994769f42 update video playlists and marquee announcements 
Change-Id: I853a30370bb79d3f392da11e24358c15d42005e5
 2013-05-20 12:23:58 -07:00
Robert Greenwalt
e0fc187549 am dfbf9901: am 5c11e8ee: Fix off-by-1 error in timing 
* commit 'dfbf9901b4c16c6f7658d3e8bdb1573886c927e4':
  Fix off-by-1 error in timing
 2013-05-20 09:44:42 -07:00
Robert Greenwalt
dfbf9901b4 am 5c11e8ee: Fix off-by-1 error in timing 
* commit '5c11e8ee5463b88907814e3e8716af292f90fb86':
  Fix off-by-1 error in timing
 2013-05-20 09:43:17 -07:00
Baligh Uddin
9faa81cc90 Import translations. DO NOT MERGE 
Change-Id: Ia44a6defb147cb0e0902810e15aed1d896570db9
Auto-generated-cl: translation import
 2013-05-20 09:42:45 -07:00
Baligh Uddin
8a080c5ebb Import translations. DO NOT MERGE 
Change-Id: I0cd3526ac4c444fbfc97265a9570259b5b0f3934
Auto-generated-cl: translation import
 2013-05-20 09:32:15 -07:00
Robert Greenwalt
5c11e8ee54 Fix off-by-1 error in timing 
If deferred action msg was delivered promptly it would end up
looking like it too needed to be deferred and then nothing
would end up getting done.

bug:9014777
Change-Id: I243df70463ebb9333efd6df510f71f9d8d9bdf91
 2013-05-20 09:28:08 -07:00
The Android Open Source Project
30dbdfff1b am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0':
  Fix issue #9000597: PackageManager get NPE while running performance plan
 2013-05-20 08:22:43 -07:00
The Android Open Source Project
2eed10ac3f Reconcile with jb-mr2-release - do not merge 
Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702
 2013-05-20 08:20:20 -07:00
Chet Haase
d8b0b23324 Add null check in ViewOverlay 
View.getOverlay().clear() can failed with an NPE if there are
no drawables in the overlay. Fix: add a null check before dereferencing
the mDrawables field.

Issue #8895794 getOverlay.clear() crashes if drawables were not added previously

Change-Id: I9b2a63036450915681ba3a89a0911e2490063702
 2013-05-20 07:57:02 -07:00
The Android Automerger
1f3fa2cfeb merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-20 05:55:17 -07:00
Robert Greenwalt
a75ab0337a am c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev 
* commit 'c3de50cd3cff76082bc01b04a8a6bbde300d725e':
  Add some temp wifi debugging output
 2013-05-19 12:51:47 -07:00
Robert Greenwalt
c3de50cd3c am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev 
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
  Add some temp wifi debugging output
 2013-05-19 12:49:44 -07:00
Robert Greenwalt
30c798d587 Merge "Add some temp wifi debugging output" into jb-mr2-dev 2013-05-19 19:46:58 +00:00
The Android Automerger
665191bb4b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-19 05:55:27 -07:00
John Spurlock
fb16a68cc6 am c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev 
* commit 'c6ab8a614767cae1fc9df5984414c9f15ea7b588':
  Deactivate notification listeners disabled at runtime.
 2013-05-19 01:25:34 -07:00
John Spurlock
c6ab8a6147 am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev 
* commit 'd0154550e0d5e8dea5b65849747266f5fa0d2d5d':
  Deactivate notification listeners disabled at runtime.
 2013-05-19 01:23:30 -07:00
John Spurlock
d0154550e0 Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev 2013-05-19 08:03:48 +00:00
Robert Greenwalt
02ba86f0cc Add some temp wifi debugging output 
bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9
 2013-05-18 13:40:49 -07:00
John Spurlock
79f7892c10 Deactivate notification listeners disabled at runtime. 
PACKAGE_CHANGED is called when either the application or any
of its components change.  Rework old early exit code to
handle component-level disabling wrt listeners.

Note PACKAGE_CHANGED can take quite a while to reach NMS.
Up to ten seconds (!) after component-disabling in app.

Bug:8982243
Change-Id: Ia325516140dd9288466a663192a5326019f071ab
 2013-05-18 14:29:40 -04:00
Brett Chabot
98354974f9 am 6ffce75f: am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev 
* commit '6ffce75fa78fba82bde8f1df5828d177457b7a7a':
  Fix PhoneWindowManager#getUserRotationMode
 2013-05-17 17:19:02 -07:00
Santos Cordon
5c6370a405 am 8e3f01e9: am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev 
* commit '8e3f01e90ed51b055e0addb7d5114b732bd514b9':
  Update documentation of NEW_OUTGOING_CALL
 2013-05-17 17:19:00 -07:00