Commit Graph

61139 Commits

Author SHA1 Message Date
Yohei Yukawa
a715dcfa3d Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev am: 218c2ab00a
am: 96196358a5

* commit '96196358a50ca2cb8b7c4267a69a802f42b70ff8':
  Fix bugs in logic to find a default selectd IME.
2016-02-18 09:39:07 +00:00
Yohei Yukawa
96196358a5 Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev
am: 218c2ab00a

* commit '218c2ab00ae1597e2728d8b2c865269717150dd3':
  Fix bugs in logic to find a default selectd IME.
2016-02-18 09:34:21 +00:00
Yohei Yukawa
218c2ab00a Merge "Fix bugs in logic to find a default selectd IME." into nyc-dev 2016-02-18 09:30:45 +00:00
Yohei Yukawa
c2393ac3bf Fix bugs in logic to find a default selectd IME.
With this CL, InputMethodManagerService#resetDefaultImeLocked()
picks up the default selected IME with the same logic to find the
default enabled IMEs [1].  It should make sense because the default
selected IME should be one of the default enabled IMEs.  The previous
code is problematic because it does not check whether the IME is enabled
or not.  There was a chance that unusable IME could be picked up.

This CL also fixes the same problem to Bug 17347871 that only language
part of the locale is taken into account.

  [1] See the following series of CLs.
    - part 1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
              ed20f8d750ef0b6347448265a14ef2a2c7e1af5c
    - part 2: Ife93d909fb8a24471c425c903e2b7048826e17a3
              745e7bca8a622ffdf0d0a8e8e2485eab98182ede
    - part 3: I6571d464a46453934f0a8f5e79018a67a9a3c845
              d0dbd81fe2cd34c9a83e2f5217374d3e1a79f950
    - part 4: I871ccda787eb0f1099ba3574356c1da4b33681f3
              b21220efae

Bug: 27197621
Change-Id: Ia0f52c1fb9f5a68230284a1ec4829a2337b60bdd
2016-02-18 00:30:45 -08:00
Erik Kline
abef123606 {,Base}DhcpStateMachine is no more am: efa4209fe0 am: 7651b21fe9
am: 9a927da7cf

* commit '9a927da7cfd565ee21f5929f2195f9295f81f160':
  {,Base}DhcpStateMachine is no more
2016-02-18 04:46:40 +00:00
Erik Kline
9a927da7cf {,Base}DhcpStateMachine is no more am: efa4209fe0
am: 7651b21fe9

* commit '7651b21fe94dc081276a7bbff72f8c37a70f1b94':
  {,Base}DhcpStateMachine is no more
2016-02-18 04:42:58 +00:00
Erik Kline
7651b21fe9 {,Base}DhcpStateMachine is no more
am: efa4209fe0

* commit 'efa4209fe022d007f48edc3c4feaef00a9865cb5':
  {,Base}DhcpStateMachine is no more
2016-02-18 04:38:38 +00:00
Erik Kline
efa4209fe0 {,Base}DhcpStateMachine is no more
Bug: 26991160
Change-Id: I21f8c30627bf2a7fbcd5b4d5f1f1ad1a2dda759b
2016-02-18 12:56:45 +09:00
Deepanshu Gupta
c10b7493b6 Merge "LayoutLib fixes for N" into nyc-dev am: f0c5b7af6f
am: 89237f4b7f

* commit '89237f4b7fcde0dd45a7734df8a742e3a94b8cb9':
  LayoutLib fixes for N
2016-02-18 03:33:59 +00:00
Deepanshu Gupta
89237f4b7f Merge "LayoutLib fixes for N" into nyc-dev
am: f0c5b7af6f

* commit 'f0c5b7af6f062e6e064af22ee58e9eb6b549a6ce':
  LayoutLib fixes for N
2016-02-18 03:28:35 +00:00
Alex Klyubin
c65ea747f7 Merge "Use production ID for v2 signing scheme." into nyc-dev am: be8c223c24
am: 74d5138dc2

* commit '74d5138dc2b097fbcde753fc79434d5b0bb9744e':
  Use production ID for v2 signing scheme.
2016-02-18 02:11:44 +00:00
Deepanshu Gupta
491523d52c LayoutLib fixes for N
Moves LayoutLib to Java 8 - YAY!
Fix delegates

Change-Id: I098996e43e330e995d33f12df1c16355bbc02f0f
2016-02-18 02:10:24 +00:00
Alex Klyubin
74d5138dc2 Merge "Use production ID for v2 signing scheme." into nyc-dev
am: be8c223c24

* commit 'be8c223c2459be17f7ee8a5f078b11a34fd1b7ca':
  Use production ID for v2 signing scheme.
2016-02-18 02:07:59 +00:00
Alex Klyubin
be8c223c24 Merge "Use production ID for v2 signing scheme." into nyc-dev 2016-02-18 02:03:48 +00:00
Winson
30a969b513 Only set the task description if the colors are opaque. am: 2d47683ab9
am: 07801468b2

* commit '07801468b2b1c61e2fcb0a12516e1b3d1de5a466':
  Only set the task description if the colors are opaque.
2016-02-18 00:24:00 +00:00
Winson
07801468b2 Only set the task description if the colors are opaque.
am: 2d47683ab9

* commit '2d47683ab969a1da30209e44712ce6513e324b89':
  Only set the task description if the colors are opaque.
2016-02-18 00:18:06 +00:00
Felipe Leme
c774bd9614 Merge "Fixed typo on Storage Access Framework." into nyc-dev am: 79c11a8c55
am: e14f8583c5

* commit 'e14f8583c518e476da7f4c677c99dc29b62d87d1':
  Fixed typo on Storage Access Framework.
2016-02-18 00:01:17 +00:00
Makoto Onuki
933f3d03c3 Merge "[framework] Don\'t allow apps on external storage to be active admin" into nyc-dev am: fc482c30b7
am: d55874a6e2

* commit 'd55874a6e2a98527d32b148d8ea097e9dea319e3':
  [framework] Don't allow apps on external storage to be active admin
2016-02-18 00:00:11 +00:00
Felipe Leme
bd6a1fc76e Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev am: 014a0d11c7
am: ac6f61dd27

* commit 'ac6f61dd27c0a11b8ee8c3121849094ddb4bb9d9':
  Removed Intent.OPEN_EXTERNAL_DIRECTORY.
2016-02-17 23:56:52 +00:00
Felipe Leme
ba2707d9dc Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev am: 3c3770d8fe
am: f3fb06dd3d

* commit 'f3fb06dd3da173011eb04ea1d44f498ac7cb1152':
  Initial implementation of StorageManager.getVolumesList().
2016-02-17 23:55:41 +00:00
Felipe Leme
e14f8583c5 Merge "Fixed typo on Storage Access Framework." into nyc-dev
am: 79c11a8c55

* commit '79c11a8c550090436fed7ad540b5d5d20e1faeb2':
  Fixed typo on Storage Access Framework.
2016-02-17 23:53:07 +00:00
Arunesh Mishra
de15666923 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev am: df8d02b074
am: 9f43371bae

* commit '9f43371bae759ba773ef179f091d9d5fdf668cad':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:51:33 +00:00
Makoto Onuki
d55874a6e2 Merge "[framework] Don\'t allow apps on external storage to be active admin" into nyc-dev
am: fc482c30b7

* commit 'fc482c30b7a3c2cf7bc14d5c86de758a16f6433d':
  [framework] Don't allow apps on external storage to be active admin
2016-02-17 23:51:15 +00:00
Felipe Leme
ac6f61dd27 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev
am: 014a0d11c7

* commit '014a0d11c7ac521b77c62278d31ce4d41c5f33b7':
  Removed Intent.OPEN_EXTERNAL_DIRECTORY.
2016-02-17 23:49:22 +00:00
Felipe Leme
f3fb06dd3d Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev
am: 3c3770d8fe

* commit '3c3770d8fe9f64fc92de02f3e52901748e1f30de':
  Initial implementation of StorageManager.getVolumesList().
2016-02-17 23:47:27 +00:00
Arunesh Mishra
9f43371bae Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev
am: df8d02b074

* commit 'df8d02b07499d0def4a6761b793d4af329309254':
  SoundTriggerHelper changes for GenericSoundModels.
2016-02-17 23:44:56 +00:00
Winson
2d47683ab9 Only set the task description if the colors are opaque.
Bug: 27214638
Change-Id: I75e0b8871087f0b8e6acd16dc751bb6374c0f968
2016-02-17 23:23:45 +00:00
Felipe Leme
79c11a8c55 Merge "Fixed typo on Storage Access Framework." into nyc-dev 2016-02-17 22:51:02 +00:00
Makoto Onuki
fc482c30b7 Merge "[framework] Don't allow apps on external storage to be active admin" into nyc-dev 2016-02-17 22:48:13 +00:00
Felipe Leme
53fcc756d0 Fixed typo on Storage Access Framework.
BUG: 26742218
Change-Id: I9b695ebe2176f186fc63b20f624e40dd9e257bc3
2016-02-17 14:45:52 -08:00
Felipe Leme
014a0d11c7 Merge "Removed Intent.OPEN_EXTERNAL_DIRECTORY." into nyc-dev 2016-02-17 22:43:20 +00:00
Felipe Leme
3c3770d8fe Merge "Initial implementation of StorageManager.getVolumesList()." into nyc-dev 2016-02-17 22:42:40 +00:00
Arunesh Mishra
df8d02b074 Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev 2016-02-17 22:42:34 +00:00
Felipe Leme
34a9d52719 Removed Intent.OPEN_EXTERNAL_DIRECTORY.
Such intent is now encapsulated by StorageVolume.createAccessIntent().

BUG: 26742218

Change-Id: I2e2bd71126ecd74981f77b0af7d069f51aaece74
2016-02-17 14:38:25 -08:00
Chad Brubaker
e84d7d6f3f Merge "Fix getAcceptedIssuers" into nyc-dev am: da449afbfe
am: 834038747d

* commit '834038747d7eb3eb2680713c32e6c6d40b3d04df':
  Fix getAcceptedIssuers
2016-02-17 22:38:07 +00:00
Chad Brubaker
834038747d Merge "Fix getAcceptedIssuers" into nyc-dev
am: da449afbfe

* commit 'da449afbfeac5d9d20e94d4c34e4d00b18b4b017':
  Fix getAcceptedIssuers
2016-02-17 22:28:18 +00:00
Makoto Onuki
f34db0a17e [framework] Don't allow apps on external storage to be active admin
Bug 27149287

Change-Id: I6d959d2e66dc0b19f78e6135fbdcf45ca8551958
2016-02-17 14:24:25 -08:00
Arunesh Mishra
3fff7f5634 SoundTriggerHelper changes for GenericSoundModels.
- Refactoring SoundTriggerHelper to handle generic sound models.
     - Ability to store multiple models, callback and state information.
     - Separate out initialization to be done per voice model, per any model
     and per generic model.
 - Minor change to the API exposed -- removing the Handler from the
   createSoundTriggerDetector call.
 - Added callback processing for onRecognitionEvent().
 - Added logic for stopAll().
 - Changes to the SoundTriggerTestApp to start/stop recognition.
     - Multiple models (3).
     - Ability to start/stop/load/unload individual models.

Bug: 22860713
Bug: 27222043
Change-Id: Ie5d811babb956bead653fb560a43f1e549ed11bd
2016-02-17 14:24:03 -08:00
Amith Yamasani
f886598679 Merge "Clean up App Standby code" into nyc-dev am: 0137c3daf4
am: 4dcb319701

* commit '4dcb3197011c5fe75a3a39d436423689af27227a':
  Clean up App Standby code
2016-02-17 22:21:55 +00:00
Chad Brubaker
da449afbfe Merge "Fix getAcceptedIssuers" into nyc-dev 2016-02-17 22:20:36 +00:00
Amith Yamasani
4dcb319701 Merge "Clean up App Standby code" into nyc-dev
am: 0137c3daf4

* commit '0137c3daf4bdd3154b71d9b34536960c424fc422':
  Clean up App Standby code
2016-02-17 22:01:27 +00:00
Amith Yamasani
0137c3daf4 Merge "Clean up App Standby code" into nyc-dev 2016-02-17 21:50:32 +00:00
Amith Yamasani
ca5d6d2a81 Clean up App Standby code
Don't continue to check idle states for removed / stopped users.
No need to check for uninstalled packages for all users.

Bug: 27208519
Change-Id: I9a3a3bbec560dd380ce90df9fef102d7f62769ca
2016-02-17 13:36:48 -08:00
Tony Mak
dab9ccbfe9 Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev am: 181d907d24
am: cc5bd97810

* commit 'cc5bd9781038c4bf9b2edd07b482cdf50bc9af8b':
  [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
2016-02-17 21:36:48 +00:00
Jorim Jaggi
b0a301396d Make sure we call reportResized exactly once when drag starting am: c662d8e946
am: ab3e290fe2

* commit 'ab3e290fe264ddc3874ebc96addb33c7a7ca3b1d':
  Make sure we call reportResized exactly once when drag starting
2016-02-17 21:28:06 +00:00
Tony Mak
cc5bd97810 Merge "[ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID" into nyc-dev
am: 181d907d24

* commit '181d907d2416dcf780640f3c3fb13623acc187a1':
  [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
2016-02-17 21:25:27 +00:00
Jorim Jaggi
ab3e290fe2 Make sure we call reportResized exactly once when drag starting
am: c662d8e946

* commit 'c662d8e94620c84b2fa57bfd6e45690f0c349d89':
  Make sure we call reportResized exactly once when drag starting
2016-02-17 21:18:23 +00:00
Felipe Leme
04a5d40cf3 Initial implementation of StorageManager.getVolumesList().
This change makes StorageManager.getVolumesList(),
StorageManager.getPrimaryVolume(),  and StorageVolume public and adds a
buildAccessIntent() in the latter to automatically generate the
ACTION_OPEN_EXTERNAL_DIRECTORY intent, but it doesn't change the
ACTION_OPEN_EXTERNAL_DIRECTORY implementation yet (i.e., it still takes an URI with the physical path of the directory, instead of a StorageVolume and
a directorny name).

BUG: 26742218

Change-Id: I36c59c42b6579e125ec7f03c3af141260875a491
2016-02-17 13:14:39 -08:00
Tony Mak
fd9ec5a600 [ContactsContract] Add new API PhoneLookup.CONTACT_ID and DATA_ID
It is a mistake that we put contact id in PhoneLookup._ID.
But for SIP query, the contact id is put in Data.CONTACT_ID instead.
For backward-compability issue, we can't revert the change, but to
save developer from having logic like below, PhoneLookup.CONTACT_ID is
introduced.

if (sip) {
    get contact id in Data.CONTACT_ID column
} else {
    get contact id in PhoneLookup._ID column
}

So for sip query, we put contact id in PhoneLookup.CONTACT_ID.
For other phone lookup query, we put contact id in both PhoneLookup.ID
and PhoneLookup.CONTACT_ID.

BUG:27149017

Change-Id: I4155da29bbacdda0d43164b0ce11c7224a4eee67
2016-02-17 21:08:09 +00:00
Jorim Jaggi
c662d8e946 Make sure we call reportResized exactly once when drag starting
If there was another layout happening before the app called
relayoutWindow(), we were issuing multiple reportResized calls,
leading to multiple relayoutWindow() calls, slowing everything
down.

Change-Id: I1f3da04bb7581c655567e1d1a6fe0f8c83c0ffda
2016-02-17 21:02:13 +00:00