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

200755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
d7f12b05dc am 1b75e639: am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev 
* commit '1b75e6391a271c8bf6105c71877dd583beca7a91':
  Fix QS labels on language change
 2015-07-14 18:04:46 +00:00
Marco Nelissen
f12612c8e2 am 48c78cfb: am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit '48c78cfb9e9c055ee97be0aaac02832f758ee396':
  Use original path if translated path doesn't exist
 2015-07-14 18:04:40 +00:00
Craig Lafayette
986b40ea99 am 7df8b265: am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev 
* commit '7df8b2658faf91fdcd15a7aecbeb0146cf1d5ab3':
  Prevent null allowableAccounts from crashing
 2015-07-14 18:04:32 +00:00
Chris Craik
230d8243de am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '9f43ac777a0a5325002cabc37cb32a255eebe522':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 18:04:26 +00:00
Jason Monk
1b75e6391a am 5086a970: am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev 
* commit '5086a970e786ac4629f5f275a5df25f6e24e1f61':
  Fix QS labels on language change
 2015-07-14 18:00:37 +00:00
Amit Mahajan
51b4e97ae4 Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev 2015-07-14 17:59:20 +00:00
Julia Reynolds
b8a46a6c77 Pass wifi ap state through to tile when receiver triggered. 
Bug: 22450078
Change-Id: I9b339aa2238a7427291bfdc2ef6aab58dcdb5cf3
 2015-07-14 13:56:03 -04:00
Marco Nelissen
48c78cfb9e am c56668eb: am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit 'c56668eb223fe45ff5c1e399d99943838320c407':
  Use original path if translated path doesn't exist
 2015-07-14 17:49:56 +00:00
Craig Lafayette
7df8b2658f am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev 
* commit 'd86ab3c539cd548d54620edf8836546695dd7424':
  Prevent null allowableAccounts from crashing
 2015-07-14 17:49:51 +00:00
Chris Craik
9f43ac777a am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit 'e2a5c184e396b748e390672996ebeca25c2b9b83':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:49:47 +00:00
Jason Monk
5086a970e7 am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev 
* commit 'fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
  Fix QS labels on language change
 2015-07-14 17:49:29 +00:00
Jason Monk
fe03a84bc6 Merge "Fix QS labels on language change" into mnc-dev 2015-07-14 17:40:23 +00:00
Marco Nelissen
c56668eb22 am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev 
* commit '3ced96178b1b132705e773736cbb707a3a0cd951':
  Use original path if translated path doesn't exist
 2015-07-14 17:36:07 +00:00
Craig Lafayette
d86ab3c539 am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev 
* commit '2f0116fa3ab2153188e43e87b194afae7e4efb81':
  Prevent null allowableAccounts from crashing
 2015-07-14 17:36:02 +00:00
Chris Craik
e2a5c184e3 am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:35:50 +00:00
Jason Monk
f05ca67ce4 Move wifi accessibility strings to SettingsLib 
Bug: 22468835
Change-Id: I66e85e8adfb3eda194995eda529422a172f00cbd
 2015-07-14 13:32:33 -04:00
Marco Nelissen
3ced96178b Merge "Use original path if translated path doesn't exist" into mnc-dev 2015-07-14 17:30:06 +00:00
Amit Mahajan
7c5befa4a7 Add checks for READ_PRIVILEGED_PHONE_STATE. 
Callers will have either PRIVILEGED or regular READ_PHONE_STATE.

Bug: 22468536
Change-Id: I60251f61250a975f4147b027d2539824a728e3b5
 2015-07-14 10:26:00 -07:00
Craig Lafayette
2f0116fa3a Merge "Prevent null allowableAccounts from crashing" into mnc-dev 2015-07-14 17:25:40 +00:00
George Mount
80141d1c8b Fix input pause without resume. 
Bug 22455206

Previously, when an exit activity transition was created, the input
would be paused. This worked fine as long as the transition was
run. However, sometimes that transition wasn't run and this would
cause the input to fail to be started again.

This fix moves the input pause to when the transition is started.

Change-Id: I738d5471f7932f00b50897f87a8f8a71ecbc57e2
 2015-07-14 10:03:06 -07:00
Alex Klyubin
9a3db4e5d5 am 21a0f80f: am 5eaf2412: am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 
* commit '21a0f80f87873ee1239ee02113475adb82af6a6c':
  Fix Android Keystore key factories to obey JCA contract.
 2015-07-14 17:00:35 +00:00
Chris Craik
941bcedb4c Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 2015-07-14 16:58:01 +00:00
Alex Klyubin
21a0f80f87 am 5eaf2412: am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 
* commit '5eaf24126d4496f9a157280007b8bb89500a3ea1':
  Fix Android Keystore key factories to obey JCA contract.
 2015-07-14 16:46:12 +00:00
Jason Monk
a758ba6be9 Fix QS labels on language change 
Some tiles now won't do updates if the state hasn't changed (rotation) to avoid
breaking the animation state. To handle this, state is cleared when the
configuration changes.

Bug: 22206214
Change-Id: I029fb4c75cc920a6c9907b65e8c48d28c21d529a
 2015-07-14 12:29:28 -04:00
Alex Klyubin
5eaf24126d am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 
* commit '10633c96b55d13f05304b758b01be48035adece3':
  Fix Android Keystore key factories to obey JCA contract.
 2015-07-14 16:28:28 +00:00
Alex Klyubin
10633c96b5 Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev 2015-07-14 16:16:03 +00:00
Yohei Yukawa
1e01d62160 am 17dce343: am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 
* commit '17dce3432f93fcc33c2eedae3b1d3bbd2b5301c3':
  Allow FloatingToolbar to be outside of the attached window.
 2015-07-14 16:14:43 +00:00
Yohei Yukawa
17dce3432f am be27832b: am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 
* commit 'be27832bba3291be6eb11cc449c9730ea265f3dc':
  Allow FloatingToolbar to be outside of the attached window.
 2015-07-14 15:59:22 +00:00
Ronghua Wu
63488bc788 am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '16567cf24d796dd09c0ef325be10b1cd5f893f1d':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 15:59:16 +00:00
Ronghua Wu
16567cf24d am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '70250d3597091c03c28050f4c3e17af8f0295bc0':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 15:45:20 +00:00
Yohei Yukawa
be27832bba am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 
* commit '12952c79528cd7ea804c400e5908a24e56f69bbe':
  Allow FloatingToolbar to be outside of the attached window.
 2015-07-14 15:45:05 +00:00
Yohei Yukawa
12952c7952 Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev 2015-07-14 15:35:57 +00:00
Ronghua Wu
70250d3597 am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '148c7c5c1794a9e306660f22c7cbbbc9906e5f5e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 15:33:25 +00:00
Marco Nelissen
aa41103668 Use original path if translated path doesn't exist 
Bug: 22376538
Change-Id: I2f6af4fa31c097e2e2d619a068cf83721091c450
 2015-07-14 08:25:23 -07:00
Ronghua Wu
148c7c5c17 Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 2015-07-14 15:21:34 +00:00
Craig Lafayette
3c9c71d36e Prevent null allowableAccounts from crashing 
The javadoc for newChooseAccountIntent says that a null
value for the allowableAccounts parameter is valid and
an acceptable default. This CL makes sure that when this
parameter is null, a NullPointerException is not thrown.

Bug: 22475546
Change-Id: Ieb0d67dd02628e1ae5629499b3be3c6382efc9aa
 2015-07-14 11:09:58 -04:00
Andrei Stingaceanu
b9384d5d54 am 31ccc9f0: am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev 
* commit '31ccc9f0e015a4dee041f8324bcedf76d8dcb137':
  Fix "Select All" in extracted mode
 2015-07-14 14:44:27 +00:00
Andrei Stingaceanu
31ccc9f0e0 am a7e2ab6e: am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev 
* commit 'a7e2ab6ec68d277cc9a8aa3fd51911ba48f271e0':
  Fix "Select All" in extracted mode
 2015-07-14 14:30:20 +00:00
Julia Reynolds
f4874b74fd am 2ed576fa: am 66b73dce: am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev 
* commit '2ed576fa6c4d2bd4df092eef0bc8c76ccb3c788b':
  Retrieve resources for apps, even if not installed for current user.
 2015-07-14 14:23:14 +00:00
Andrei Stingaceanu
a7e2ab6ec6 am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev 
* commit '8af7432ca3fc1ce3539997d24439954f0e64134c':
  Fix "Select All" in extracted mode
 2015-07-14 14:17:48 +00:00
Julia Reynolds
2ed576fa6c am 66b73dce: am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev 
* commit '66b73dcee2cb885ad0dc35a25fcb93bdc586ea30':
  Retrieve resources for apps, even if not installed for current user.
 2015-07-14 14:10:24 +00:00
Andrei Stingaceanu
8af7432ca3 Merge "Fix "Select All" in extracted mode" into mnc-dev 2015-07-14 14:03:23 +00:00
Julia Reynolds
66b73dcee2 am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev 
* commit 'f5e20ec36480897f4c37fd63554872e74d874f02':
  Retrieve resources for apps, even if not installed for current user.
 2015-07-14 13:55:45 +00:00
Julia Reynolds
f5e20ec364 Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev 2015-07-14 13:47:44 +00:00
Julia Reynolds
c7fd3462a2 Retrieve resources for apps, even if not installed for current user. 
Bug: 21448052
Change-Id: Id5db428a6faca4a905684088c47e070752ac2899
 2015-07-14 09:24:22 -04:00
Yohei Yukawa
bafc908304 Allow FloatingToolbar to be outside of the attached window. 
Currently PopupWindow used for the floating toolbar specifies
neither FLAG_LAYOUT_NO_LIMITS nor FLAG_LAYOUT_IN_SCREEN.
As a result, the floating toolbar can overlap the selected
text when the attached window does not have enough height.

Here is the repro code.

    final TextView textView = new TextView(this);
    textView.setLayoutParams(
            new ViewGroup.LayoutParams(
                    ViewGroup.LayoutParams.MATCH_PARENT,
                    ViewGroup.LayoutParams.WRAP_CONTENT));
    textView.setText("A test sentence.");
    textView.setTextIsSelectable(true);
    final AlertDialog dialog = new AlertDialog.Builder(this)
            .setView(textView)
            .create();
    dialog.getWindow().setGravity(Gravity.BOTTOM)
    dialog.show();

If you tap a word in the dialog, the floating toolbar
unintentionally overlaps the selected text due to the limited
height of the AlertDialog.

It also turns out that just calling
  PopupWindow.setClippingEnabled(false)
to specify FLAG_LAYOUT_NO_LIMITS is not sufficient and ends up
showing the toolbar on the NavBar because we have mistakenly
compared bounds in window-local coordinates
(e.g. FloatingActionModemContentRectOnWindow) with bounds in
screen coordinates (e.g. FloatingActionMode#mScreenRect).
Hence the confusion of window-local coordinates and screen
coordinates in FloatingToolbar and FloatingToolbar also needs
to be addresses.

To summarize here are the notable changes in this CL:
  - Specify FLAG_LAYOUT_NO_LIMITS so that the floating
    toolbar can be placed outside of the attached window.
    (We do this with PopupWindow#setClippingEnabled)
  - Switch to use screen coordinates from window-local
    coordiantes in FloatingToolbar and FloatingActionMode
    because some system components such as WindowManager
    prefer screen coordinates.
  - Put -OnScreen suffix for Rect and Point variables
    as long as they are in screen coordinates.

Bug: 22335001
Change-Id: I71a8d356e868dc7715b030ca1078da4ec39368c3
 2015-07-14 05:59:05 -07:00
Andrei Stingaceanu
dfa116e2f7 am 2e59771e: am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev 
* commit '2e59771e74870b4f0ba23375509ed4db727acb12':
  Fix insertion handle disappearing in extract mode
 2015-07-14 10:40:18 +00:00
Andrei Stingaceanu
5396c131c0 Fix "Select All" in extracted mode 
Stop calling onExtractTextContextMenuItem if "Select All"
is selected (the action does not modify text thus does
not need batch editing). Editor#finishBatchEdit reports
that text changed which in turn can stop the action mode
and the selection after it was started by onPreDraw.

Bug: 22059417
Change-Id: I5354cbe4bae374e0d5f3de39616336170ee33b92
 2015-07-14 11:37:28 +01:00
Andrei Stingaceanu
2e59771e74 am 0e6360f4: am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev 
* commit '0e6360f4542f266a2f1d7ba9fb802bffa6001b9b':
  Fix insertion handle disappearing in extract mode
 2015-07-14 10:28:00 +00:00
Andrei Stingaceanu
0e6360f454 am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev 
* commit 'a9b9907f3c472e70d0950964d3e2c83c4926af14':
  Fix insertion handle disappearing in extract mode
 2015-07-14 10:14:22 +00:00