Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,317 Commits 3 Branches 0 Tags
ed56b6d14a4fbbbe6bf87fbda20d1ad54fc86dfb
Commit Graph

198317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
ed56b6d14a am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev 
* commit 'efb49bd81101046ced1f75aeef81dcda27580514':
  Constrain width and height to >= 0 in FastScroller layout
 2015-06-25 17:16:36 +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
Alex Klyubin
f26ddd4c5d am 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev 
* commit '9440a6e6bed93e2816647b6834d543fd57181a86':
  Support RSA encrypt using private key and PKCS#1 paddding.
 2015-06-25 17:00:01 +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
Alex Klyubin
9440a6e6be Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev 2015-06-25 16:46:17 +00:00
Alex Klyubin
25d2270704 Support RSA encrypt using private key and PKCS#1 paddding. 
Some apps such as OpenVPN Connect for some reason generate
PKCS#1-padded RSA signatures using Cipher (initialized in
Cipher.ENCRYPT_MODE with private key!) instead of using Signature.

Unfortunately, RI supports this strange behavior and previous releases
of Android Keystore did the same. So, we have to continue supporting
this craziness.

Bug: 22083023
Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
 2015-06-25 09:09:04 -07:00
Mady Mellor
829c2f712c am d4d802be: Merge "Fix: Don\'t display the drag handles when focus is lost" into mnc-dev 
* commit 'd4d802be39c67bf207bbb693d32c6a59c78ed3bb':
  Fix: Don't display the drag handles when focus is lost
 2015-06-25 16:03:03 +00:00
Andrei Stingaceanu
7055d60f77 am 3d7109a1: Merge "EditText - can not drag handles in extracted mode" into mnc-dev 
* commit '3d7109a1f6be56417367ecfdfb2a77c7fe4de3a9':
  EditText - can not drag handles in extracted mode
 2015-06-25 16:02:58 +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
Andres Morales
87d64a1bfb am f1900b50: Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev 
* commit 'f1900b500f71c372376b5d951d581afcca8d7b57':
  [LockSettings] clear secure user id when user is removed
 2015-06-25 15:53:04 +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
Andres Morales
f1900b500f Merge "[LockSettings] clear secure user id when user is removed" into mnc-dev 2015-06-25 15:43:13 +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
544eeef3b8 am c781405f: Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev 
* commit 'c781405f43ca06041777f2e382c0d5b7bdeac43a':
  Use standard copyright banner in android/security/keymaster.
 2015-06-25 15:15:05 +00:00
Alex Klyubin
7a57baff7c am 6223b7e9: Merge "Track rename of INT and LONG Keymaster tag types." into mnc-dev 
* commit '6223b7e911b764ed163cb5030fff5f3744724a7f':
  Track rename of INT and LONG Keymaster tag types.
 2015-06-25 15:15:00 +00: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
Jason Monk
87526d48d3 am 107cb81f: Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 
* commit '107cb81f9054a406b94e249c99fd7d64be71faec':
  Make BluetoothEventManager listen to ALIAS_CHANGED
 2015-06-25 14:14:41 +00:00
Jason Monk
107cb81f90 Merge "Make BluetoothEventManager listen to ALIAS_CHANGED" into mnc-dev 2015-06-25 14:05:22 +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
Igor Viarheichyk
94c063629c am 729ffa29: ICU format support for pseudolocalizes. 
* commit '729ffa299ca786eb21ba8330096b33c7bcd66fbf':
  ICU format support for pseudolocalizes.
 2015-06-25 09:46:51 +00:00
Igor Viarheichyk
729ffa299c ICU format support for pseudolocalizes. 
Custom parser can handle nested ICU messages even if they
are split into multiple fragments. Code reworked to encapsulate
all pseudolocalization logic in Pseudolocalizer and PseudoMethods
classes. To minimize a changelist size, some static functions
remained. Fake BiDi pseudolocalization method is reimplemented
to handle word boundaries correctly. Unit tests added.

(cherry picked from commit cbb1e676b5)

bug: 22060509

Change-Id: I11968d81984d99501a4d9334ff2e7453a1eb7a00
 2015-06-25 09:49:43 +01:00
Erik Kline
248caa168c am e42441a2: Merge "Don\'t lose critical success/failure messages" into mnc-dev 
* commit 'e42441a232ae1a75cdd2541f974ed8da258b97cd':
  Don't lose critical success/failure messages
 2015-06-25 05:17:10 +00:00
Svetoslav
87bfb8aaae am 57f2dac7: Merge "iUpdate the sensor group description" into mnc-dev 
* commit '57f2dac721e01ad92843511b142cfc5ed738dda9':
  iUpdate the sensor group description
 2015-06-25 05:16:44 +00:00
Erik Kline
e42441a232 Merge "Don't lose critical success/failure messages" into mnc-dev 2015-06-25 03:46:35 +00:00
Svetoslav
57f2dac721 Merge "iUpdate the sensor group description" into mnc-dev 2015-06-25 02:14:54 +00:00
Svetoslav
c625795539 iUpdate the sensor group description 
bug:21784262

Change-Id: I417e2170b8a977b274ca0f6b2364c670bbb5264a
 2015-06-24 19:12:52 -07:00
Anthony Hugh
e2a3fbd331 am 2e2d030b: am a50fa710: (-s ours) am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear 
* commit '2e2d030bfe3b7ba0f2c2f26e70253494eb94cc1e':
  DO NOT MERGE: Introduce stem keycodes for Wear
 2015-06-25 01:43:49 +00:00
Alex Klyubin
e0a046aa76 am 656fd493: Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev 
* commit '656fd49386ddd55e0dfe19ae7287413af7fff295':
  Make NONEwithECDSA truncate input when necessary.
 2015-06-25 01:43:44 +00:00
Andreas Gampe
9b013a5ae2 am 8f7ae66e: Merge "Frameworks/base: Add tracing system properties" into mnc-dev 
* commit '8f7ae66e47181ee87985da63d8aa6ef0cad20ab2':
  Frameworks/base: Add tracing system properties
 2015-06-25 01:43:40 +00:00
Anthony Hugh
2e2d030bfe am a50fa710: (-s ours) am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear 
* commit 'a50fa71044f759013dc506ae3dc5fce11e67494e':
  DO NOT MERGE: Introduce stem keycodes for Wear
 2015-06-25 01:37:28 +00:00
Dave Langemak
a1d731da4a am ecff75a1: Merge "Revert "Throw IAE on invalid measure spec size"" into mnc-dev 
* commit 'ecff75a158db0514dc019eb3ec9b3f04c1a8f420':
  Revert "Throw IAE on invalid measure spec size"
 2015-06-25 01:31:35 +00:00
Alex Klyubin
656fd49386 Merge "Make NONEwithECDSA truncate input when necessary." into mnc-dev 2015-06-25 01:31:21 +00:00
Andreas Gampe
8f7ae66e47 Merge "Frameworks/base: Add tracing system properties" into mnc-dev 2015-06-25 01:29:38 +00:00
Anthony Hugh
a50fa71044 am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear 
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
  DO NOT MERGE: Introduce stem keycodes for Wear
 2015-06-25 01:27:41 +00: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
Amith Yamasani
bc4f091721 am 3704da0d: Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 
* commit '3704da0d9e45605e0ff38408a30de38b672ff83e':
  No need to check WRITE_SETTINGS permission in ContentProvider
 2015-06-25 00:37:23 +00:00
Amith Yamasani
3704da0d9e Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev 2015-06-25 00:24:19 +00:00
Alan Viverette
2f5337e0fc am 10bf27e2: Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 
* commit '10bf27e2c90f05a8acad3cf902a9bf3ab8dbcca3':
  Avoid negative childSpecSize in RelativeLayout
 2015-06-25 00:17:37 +00:00
Adam Powell
a98de7733f am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit '91feb107f2c7b51bf3cbdef43bea2fb61b56a8ee':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:17:32 +00:00
Alan Viverette
10bf27e2c9 Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev 2015-06-25 00:09:06 +00:00
Adam Powell
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
Alan Viverette
39310d3606 Avoid negative childSpecSize in RelativeLayout 
Bug: 22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
 2015-06-24 17:03:48 -07:00
ztenghui
e5b744a241 am 93666e86: Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev 
* commit '93666e8691c9b41855add5c1c92bfc9e0912764e':
  Resize the VectorDrawable according to the virtual Dpi
 2015-06-24 23:45:04 +00:00
ztenghui
93666e8691 Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev 2015-06-24 23:32:18 +00:00
Alan Viverette
1e6b8f5a3a am 6acb521f: Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev 
* commit '6acb521f7c5d13b4f9891822db6121dcedce268a':
  Update local state when creating LayerDrawable from constant state
 2015-06-24 23:26:15 +00:00
Junda Liu
a36a1ba58b am e5c7ca7d: Rename and add carrier config keys for volte and ims. 
* commit 'e5c7ca7d792f0ecb8219c217d756080d1d4c3933':
  Rename and add carrier config keys for volte and ims.
 2015-06-24 23:26:01 +00:00
Alan Viverette
6acb521f7c Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev 2015-06-24 23:15:16 +00:00
Anthony Hugh
001df9ca90 DO NOT MERGE: Introduce stem keycodes for Wear 
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
 2015-06-24 16:13:19 -07:00