Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,857 Commits 3 Branches 0 Tags
08b643ddcc9a2c2bdc4fb35e1e211b1beec68e1b
Commit Graph

49421 Commits

Author SHA1 Message Date
Jun Mukai
08b643ddcc am cc45eeff: am 46f087c4: Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev 
* commit 'cc45eeff204235e769272f443194a5606bc13343':
  Apply thumbTint and trackTint styles to Switch from xml.
 2015-06-25 20:00:21 +00:00
Jun Mukai
46f087c43b Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev 2015-06-25 18:16:57 +00:00
Alan Viverette
81979f8cee am df6ca3cd: am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev 
* commit 'df6ca3cdae40ff8a0ea93c570406a969a9602aca':
  Constrain width and height to >= 0 in FastScroller layout
 2015-06-25 17:28:32 +00:00
Alan Viverette
efb49bd811 Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev 2015-06-25 17:08:42 +00:00
Alan Viverette
de14ad55f6 Constrain width and height to >= 0 in FastScroller layout 
Bug: 22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e
 2015-06-25 09:57:30 -07:00
Mady Mellor
e72764f8bb am 9fc12583: am d4d802be: Merge "Fix: Don\'t display the drag handles when focus is lost" into mnc-dev 
* commit '9fc1258344e30590abcb664942510f4dab8e06ba':
  Fix: Don't display the drag handles when focus is lost
 2015-06-25 16:18:52 +00:00
Andrei Stingaceanu
ede6cfa5ed am 705a9abc: am 3d7109a1: Merge "EditText - can not drag handles in extracted mode" into mnc-dev 
* commit '705a9abcd4e4c61e72821f3c5f58271f77d93882':
  EditText - can not drag handles in extracted mode
 2015-06-25 16:18:47 +00:00
Alex Klyubin
22c115036c am e2b9af60: am c781405f: Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 
* commit 'e2b9af60712bc7f4ae97f19efd2356996ab9100d':
  Use standard copyright banner in android/security/keymaster.
 2015-06-25 16:02:00 +00:00
Alex Klyubin
92b53c9950 am 31b8b72d: am 6223b7e9: Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 
* commit '31b8b72d454a3e5d9e18dd2c64d4f0bf185f2574':
  Track rename of INT and LONG Keymaster tag types.
 2015-06-25 16:01:55 +00:00
Mady Mellor
d4d802be39 Merge "Fix: Don't display the drag handles when focus is lost" into mnc-dev 2015-06-25 15:54:03 +00:00
Andrei Stingaceanu
3d7109a1f6 Merge "EditText - can not drag handles in extracted mode" into mnc-dev 2015-06-25 15:52:51 +00:00
Mady Mellor
a2861454aa Fix: Don't display the drag handles when focus is lost 
The text selection handles should be hidden / shown when the window
loses / regains focus.

Additionally renames method to make more sense.

Bug: 22062480
Change-Id: I6e160234cf112ee285367637e2f1c14defd82e89
 2015-06-25 08:40:27 -07:00
Alex Klyubin
c781405f43 Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 2015-06-25 15:07:28 +00:00
Alex Klyubin
6223b7e911 Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 2015-06-25 15:06:49 +00:00
Andrei Stingaceanu
1cb1f1523a EditText - can not drag handles in extracted mode 
In TextView's onPreDraw method, startSelectionActionMode()
is called, but the selection has already been started so
in startSelectionActionMode() it shows the
insertionController which hides the selectionController.
Fix this by adding a check to start the action mode only
if it is not already started.

Bug: 22028858
Change-Id: I2999423155b7a63a7d879bc8ea5032e17dff459f
 2015-06-25 11:54:43 +01:00
Narayan Kamath
c279a835d5 am 37c68894: am a78c0e0b: Merge "Fixed Javadoc typos" 
* commit '37c688948d4464d636cd64c537b98697cb4b795d':
  Fixed Javadoc typos
 2015-06-25 10:02:08 +00:00
Philipp Hasper
802aa0f8a2 Fixed Javadoc typos 
Simple single character typos

Change-Id: I17660dbb3b7ee6597637e8d76770f434ebf202ea
 2015-06-25 08:09:43 +00:00
Dave Langemak
b1b5117f9c am 63b59d3f: am ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 
* commit '63b59d3fd814224e6b17a81ab23bc706492f75e6':
  Revert "Throw IAE on invalid measure spec size"
 2015-06-25 01:44:32 +00:00
Jun Mukai
9fb302cfbc Apply thumbTint and trackTint styles to Switch from xml. 
Bug: 21664957
Change-Id: Id08ae89fb1586968df4b901816a8e108bb8570af
 2015-06-24 18:31:06 -07:00
Dave Langemak
ecff75a158 Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 2015-06-25 01:18:00 +00:00
Dave Langemak
afaed06cda Revert "Throw IAE on invalid measure spec size" 
This reverts commit ac6cfb32fe.

Change-Id: Ie60b48eac5f732071a5039b9b6bc7b18eb694d5b
 2015-06-25 01:14:26 +00:00
Alan Viverette
1fd667a2c8 am e6c01d05: am c2a30713: Merge "Duplicate description on AccessibilityEvent" 
* commit 'e6c01d05b4eb2de67bad60991cb2952fb34c3fea':
  Duplicate description on AccessibilityEvent
 2015-06-25 01:12:27 +00:00
Alan Viverette
a54e28865a am 1983fdca: am 10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 
* commit '1983fdca61eecfd964cc8b7842e2b19806fd4d1c':
  Avoid negative childSpecSize in RelativeLayout
 2015-06-25 00:31:43 +00:00
Alan Viverette
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
Alan Viverette
39310d3606 Avoid negative childSpecSize in RelativeLayout 
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
 2015-06-24 17:03:48 -07:00
Alex Klyubin
8effa36ca6 Use standard copyright banner in android/security/keymaster. 
Bug: 18088752
Change-Id: I22eec18130cc46222d50481164069e7714154979
 2015-06-24 16:06:55 -07:00
Mathieu Chartier
8fb8207412 resolved conflicts for merge of 0f14548c to mnc-dev-plus-aosp 
Change-Id: I2f79840f82150eddebfbd549afd1eca28075eb43
 2015-06-24 15:59:18 -07:00
Alan Viverette
c2a3071379 Merge "Duplicate description on AccessibilityEvent" 2015-06-24 22:47:03 +00:00
Alex Klyubin
3e7a9e4ec6 Track rename of INT and LONG Keymaster tag types. 
Bug: 22008538
Change-Id: Id0091e59738c828a96305edbfc4f3958e712278b
 2015-06-24 15:46:45 -07:00
Chris Wren
4d97dbba00 am bb9114ff: am 749d66b8: Merge "remove setLatestEventInfo" into mnc-dev 
* commit 'bb9114ff6dcef85f118afa350c33c2c35a68f41d':
  remove setLatestEventInfo
 2015-06-24 22:39:16 +00:00
Chris Wren
749d66b82f Merge "remove setLatestEventInfo" into mnc-dev 2015-06-24 22:17:45 +00:00
Adam Lesinski
0ebba0e1a6 am 53d0d065: am b21a77fe: Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 
* commit '53d0d0655ca33fbf6a1475a6b97f1a956e5c25f5':
  Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
 2015-06-24 22:11:45 +00:00
Adam Lesinski
b21a77fefc Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev 2015-06-24 21:32:38 +00:00
Christopher Tate
425bd87661 am d1741ef9: am 1af5fe23: Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev 
* commit 'd1741ef961423db062053ffb0607cd5dd5b927e9':
  Require that verified intent filters only have http/https <data> decls
 2015-06-24 20:55:53 +00:00
Mathieu Chartier
9a65f9ddd0 Merge "Add an AM option to start with allocation tracking" 2015-06-24 20:55:38 +00:00
Adam Lesinski
c30454c104 Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance() 
Bug:22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
 2015-06-24 13:35:46 -07:00
Man Cao
cfa78b2080 Add an AM option to start with allocation tracking 
The new option "--track-allocation" is to work with the new
allocation tracker in ART.

Bug:20037135
Change-Id: Ic5f8945ab4c1f167c27b05ad0d11d04bac680c1f
 2015-06-24 13:29:29 -07:00
Alex Klyubin
47686420b2 am 0a6ac701: am d4e9e0e1: Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 
* commit '0a6ac7013b9c42932b18a5a2e35cca9aac0f9337':
  Keymaster INT, LONG and DATE tag values are unsigned.
 2015-06-24 20:27:58 +00:00
Christopher Tate
413020a6ca Require that verified intent filters only have http/https <data> decls 
It is malformed to write a single intent filter like this:

  <intent-filter android:autoVerify="true">
    <data android:host="foo.example"
          android:path="/"
          android:scheme="http" />
    <data android:host="*"
          android:path="/custom"
          android:scheme="fooexamplecustomscheme" />
  </intent-filter>

In practice this app is accidentally defining a filter that will match
"http://*".  This is now detected, and will never be auto-verified for
any of the mentioned domains.

Verified intent filters must *only* handle the http & https schemes.

Bug 21920537

Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
 2015-06-24 13:16:20 -07:00
Alex Klyubin
d4e9e0e1d6 Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev 2015-06-24 20:03:10 +00:00
Chris Wren
a05db3816b remove setLatestEventInfo 
This has been deprecated since API 11.

Bug: 18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
 2015-06-24 15:18:34 -04:00
Alan Viverette
ff9b80d3be am 44863749: am 9bf9a3a9: Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 
* commit '448637498e66a8b5d2914ed0a99238c0a95c1133':
  Constrain FastScroller max width to be >= 0
 2015-06-24 18:49:35 +00:00
Alan Viverette
9bf9a3a99e Merge "Constrain FastScroller max width to be >= 0" into mnc-dev 2015-06-24 18:22:33 +00:00
Alan Viverette
c98922ba2f Constrain FastScroller max width to be >= 0 
Bug: 22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
 2015-06-24 10:22:02 -07:00
Esteban Talavera
b8abc40824 am 833af023: am e4ffec21: Merge "Reset permission policy to default when device owner goes away" into mnc-dev 
* commit '833af023a1ffe0dfa40831c6f71af48e55cc29bb':
  Reset permission policy to default when device owner goes away
 2015-06-24 17:05:23 +00:00
Esteban Talavera
e4ffec210e Merge "Reset permission policy to default when device owner goes away" into mnc-dev 2015-06-24 16:42:36 +00:00
Michael Wright
bc12a725e7 am 02791a78: am 5edd0e06: Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 
* commit '02791a78f1673ff970446df7025edee19861cca1':
  Add new SOURCE_BLUETOOTH_STYLUS.
 2015-06-24 16:34:18 +00:00
Esteban Talavera
28b9570d02 Reset permission policy to default when device owner goes away 
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.

Bug: 21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
 2015-06-24 17:19:19 +01:00
Michael Wright
5edd0e06d5 Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev 2015-06-24 16:12:22 +00:00
Andrei Stingaceanu
6517e67c1b am f7ed99e6: am 2e561546: Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev 
* commit 'f7ed99e6bc20f4692b0564b3eb18b1de2cd47129':
  Floating toolbar shown after rotation in extract mode
 2015-06-24 09:58:04 +00:00