Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,185 Commits 3 Branches 0 Tags
c54979a970ee5ba6bfaf065adbbb3bc355e8f48e
Commit Graph

52538 Commits

Author SHA1 Message Date
Filip Gruszczynski
c54979a970 am 844fbff8: Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 
* commit '844fbff80c72771d21ddabf13de8fe91312c3cd6':
  Fix NPE when requesting outsets for detached view.
 2015-06-03 18:27:14 +00:00
Abodunrinwa Toki
53c3afafb6 am 96e727d1: Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 
* commit '96e727d1e63a918039ca1b1b1c98ec23ba108247':
  Fix FloatingToolbar positioning for RTL.
 2015-06-03 18:26:52 +00:00
Yohei Yukawa
3145d0f8ce am 168d38aa: Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 
* commit '168d38aa3c200ea8a823e3faa64345e776e0da31':
  Convert subtypes whose locale is "tl" to "fil".
 2015-06-03 18:26:46 +00:00
Alex Klyubin
68ca9a5e6c am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 
* commit '85f4b7b38cedddfb0ed9f57555fb81aceca786ac':
  Fix block mode numbering (CTR got added as 4 rather than 3)
 2015-06-03 18:26:36 +00:00
Filip Gruszczynski
844fbff80c Merge "Fix NPE when requesting outsets for detached view." into mnc-dev 2015-06-03 17:50:44 +00:00
Abodunrinwa Toki
96e727d1e6 Merge "Fix FloatingToolbar positioning for RTL." into mnc-dev 2015-06-03 17:47:47 +00:00
Filip Gruszczynski
e660d4e96a Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
 2015-06-03 10:43:48 -07:00
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Alex Klyubin
85f4b7b38c Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 17:25:38 +00:00
Alex Klyubin
74a525a014 am 5c56f745: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 
* commit '5c56f74527d4d5c8c92c95e7e47319d2324bdb4d':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
 2015-06-03 16:47:03 +00:00
Alex Klyubin
4699e43dc6 Fix block mode numbering (CTR got added as 4 rather than 3) 
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
 2015-06-03 09:36:51 -07:00
Alex Klyubin
5c56f74527 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 16:35:21 +00:00
Abodunrinwa Toki
6cb5cc19d4 Fix FloatingToolbar positioning for RTL. 
-The position of the toolbar was forced to the left side in an attempt
to fix an RTL bug. This led to wrong positioning in LTR.
This is now fixed by using a dynamic "show" animation that takes into
consideration already set positions.

-The correct position of the toolbar wasn't recalculated on updates
for RTL. This is now fixed.

Bug:21455067
Change-Id: I0b31a8fd3c95549f5f10133a47a4d3ef27689010
 2015-06-03 16:24:52 +01:00
Yoshiki Iguchi
25b29c064c am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 
* commit '0d8513adcacbbbc88b5228ad6fca12a38c721fce':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
 2015-06-03 06:16:46 +00:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Shawn Willden
781a8c210e am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev 
* commit '56396c7f5b54d165b46969ea3152abbb23cf792f':
  Track changes to the keystore binder API
 2015-06-03 05:34:54 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Seigo Nonaka
16d0f5fc54 am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev 
* commit '2752a14939d113e3f2696458b0b969bc023dadfa':
  Use final in favor of initialization safety.
 2015-06-03 05:09:28 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety. 
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
 2015-06-03 04:53:44 +00:00
Casper Bonde
3b02fb6e43 am 2328423d: Add support for MITM for BluetoothSockets (1/4) 
* commit '2328423d19416da0c1068883c33e612d5729fc47':
  Add support for MITM for BluetoothSockets (1/4)
 2015-06-03 03:56:36 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4) 
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-03 03:44:40 +00:00
Erik Kline
5f69ef9e33 am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 
* commit 'b12c97040bff6b42a513b50cdf75a98d41cdb249':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
 2015-06-03 02:07:43 +00:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Svetoslav
8d8caf3091 am f559546d: Merge "Add annotations to a new API" into mnc-dev 
* commit 'f559546d8c47988f5c4278bde27eb26da1c256cc':
  Add annotations to a new API
 2015-06-03 01:06:07 +00:00
Andres Morales
a6862f4398 am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev 
* commit '8f589d01d15efe88f3678b22db97223c01a54225':
  [LockSettings] migrate patterns to be indexed at '1'
 2015-06-03 01:05:58 +00:00
Jun Mukai
a2c1367351 am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 
* commit '3c1348773ad48edbd73cf32d9ae6d23841ea4cff':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
 2015-06-03 01:05:53 +00:00
Roozbeh Pournader
ecb667ac1e am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev 
* commit 'c021632e0750e495e62c3952c506a3e5ed516dc2':
  Load hyphenation data for more languages.
 2015-06-03 01:05:48 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Andres Morales
8f589d01d1 Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev 2015-06-03 01:01:18 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API 
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
 2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00
Roozbeh Pournader
c021632e07 Merge "Load hyphenation data for more languages." into mnc-dev 2015-06-03 00:56:24 +00:00
Casper Bonde
1f276f5aaa am da177bb5: SAP: Change to use new SDP Api (4/4) 
* commit 'da177bb5a0972fec1ecedcb7d9dbd969a1b09b25':
  SAP: Change to use new SDP Api (4/4)
 2015-06-03 00:18:09 +00:00
Yohei Yukawa
92280cd309 Convert subtypes whose locale is "tl" to "fil". 
On Android, "tl" is a historic hack for what should really
be "fil". Now that we properly support 3-letter language codes,
we should be using "fil" throughout. Given this historical usage,
IMEs that really want to support Tagalog (and not Filipino)
should use the ISO-639-3 code for Tagalog, which is "tgl".

For backward compatibility reasons, this CL uses the similar
approach to I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10.
InputMethodSubtype.getLocale() continues to return the "locale"
string parameter passed to the constructor as is, but in the
Android framework we do normalizations/conversions whenever
we need a valid ISO-639-3 code.

In I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10, we rely on the
conversion in the Locale constructor.  In this CL, we do replace
"tl" with "fil" by ourselves.

This CL also adds InputMethodSubtype#getLocaleObject() a hidden
API so that we can start relying on the Locale object at least
in the framework.

This CL is based on the investigation by Narayan Kamath and his
patch.

Bug: 20696126
Change-Id: I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
 2015-06-02 17:09:50 -07:00
Casper Bonde
da177bb5a0 SAP: Change to use new SDP Api (4/4) 
Added class to carry SAP SDP record data.

Change-Id: Ic0d07402eca52c88e2be101181f6dd12e5e738d0
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-03 00:04:37 +00:00
Alan Viverette
abd531e1df am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 
* commit 'e25f6587d84c94331b2692e4eb6a2c1cbeb4be5b':
  API review feedback for ThemedSpinnerAdapter, Spinner
 2015-06-03 00:00:45 +00:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Jorim Jaggi
db97569ef8 am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev 
* commit '7d01d2c6cfcdfad74735619ab95f8396be54dc0f':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
 2015-06-02 22:39:39 +00:00
Jorim Jaggi
03d6e3284d am 11accf51: Merge "Make sure starting windows only draw once" into mnc-dev 
* commit '11accf51c2e5b3e4fcfc3d61e9b8a46c1ce0284a':
  Make sure starting windows only draw once
 2015-06-02 22:39:34 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Jorim Jaggi
11accf51c2 Merge "Make sure starting windows only draw once" into mnc-dev 2015-06-02 22:24:48 +00:00
Nicolas Prevot
d0e22281be am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit 'db6ac0e912ee935f848b4d5bede02f1f6df9e3e2':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:17:01 +00:00
Svetoslav
87b52622e0 am 3aa3f5f8: Merge "Fix java doc" into mnc-dev 
* commit '3aa3f5f892017f8a3799278c0cee8773dd4c5a0f':
  Fix java doc
 2015-06-02 22:16:55 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc 
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
 2015-06-02 15:08:48 -07:00
Svetoslav
f73b0d0998 am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit 'c5ff0020a2467e0b7aed590d790b5a1b4b082f56':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:02:23 +00:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner 
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
 2015-06-02 14:54:40 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00