Commit Graph

27068 Commits

Author SHA1 Message Date
Yohei Yukawa
4452d42016 Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816
am: 47e43e0

* commit '47e43e0f0dbbbe5919ea1799a0b206802cfda1ac':

Change-Id: I3f867b1645b869f0af4e71452870013f598881a0
2016-04-18 19:29:40 +00:00
Yohei Yukawa
8de5e7dc46 Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816
am: fb9ff81

* commit 'fb9ff81d2d43986190c640f8a77f3fa722214ae8':
  Use IME service logo or icon if exists.

Change-Id: Iefd60417a51e1536695649eeb35ebf0546f1a35c
2016-04-18 19:24:22 +00:00
Yohei Yukawa
fb9ff81d2d Merge "Use IME service logo or icon if exists." into nyc-dev
am: bd06816

* commit 'bd068163e36ed470a34655025cd01324540ab6e2':
  Use IME service logo or icon if exists.

Change-Id: Idf451086fba5e3cf8d31fe5904564340c482711a
2016-04-18 19:19:02 +00:00
Yohei Yukawa
47e43e0f0d Merge "Use IME service logo or icon if exists." into nyc-dev
am: bd06816

* commit 'bd068163e36ed470a34655025cd01324540ab6e2':
  Use IME service logo or icon if exists.

Change-Id: I32e04748622bae27482639510b2269f0210ed5b9
2016-04-18 19:18:58 +00:00
Yohei Yukawa
bd068163e3 Merge "Use IME service logo or icon if exists." into nyc-dev 2016-04-18 19:01:28 +00:00
Android Build Merger (Role)
28d31300a4 Merge "Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev am: 8852b82 am: 08f6425" into nyc-mr1-dev-plus-aosp 2016-04-18 18:35:31 +00:00
Shweta Chahar
de2bf4ae3b Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev am: 8852b82
am: 08f6425

* commit '08f64254c8c308d41147f078bff5fb1b996406a2':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: Iad560acc24cc59e18533c9d28a3f844e8df12e6c
2016-04-18 18:35:26 +00:00
Shweta Chahar
57c1b9c995 Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev am: 8852b82
am: c01beed

* commit 'c01beed396e24b689708fcb7a979a07108818426':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: I5bd59b771e81981b035e261dfd3181dc6d2f737b
2016-04-18 18:35:20 +00:00
shwetachahar
c01beed396 Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev
am: 8852b82

* commit '8852b823a41df9340b8fa8a84ee577dbef9e244b':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: I56be44e770a536c0ee41019e6864d41ceccf1fd0
2016-04-18 18:29:47 +00:00
shwetachahar
08f64254c8 Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev
am: 8852b82

* commit '8852b823a41df9340b8fa8a84ee577dbef9e244b':
  Set the minimum speech rate to a value of ten instead of zero.

Change-Id: I4cc345757114c28e04cdd5b9f9f72ea31e3d549f
2016-04-18 18:29:46 +00:00
Shweta Chahar
8852b823a4 Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev 2016-04-18 18:20:58 +00:00
Ricky Wai
b4d52ec370 Make "work mode on dialog" show personal challenge in unified work lock
Bug: 28183335
Change-Id: I905158c83f410cc9f6b1bf01c57ac2a98fdc9e58
2016-04-18 16:53:40 +01:00
Tony Mak
01da5b4ed6 Merge "Force work challenge activity to be not resizable" into nyc-dev am: 06a1d61
am: f9ccc6f

* commit 'f9ccc6f35bf71f47ef4622fc18e41e79cacd1a61':

Change-Id: Ie49615ea722a7afdaff0a91739855c0b6503fb2e
2016-04-18 15:50:29 +00:00
Tony Mak
8af909ed94 Merge "Force work challenge activity to be not resizable" into nyc-dev am: 06a1d61
am: 41893d6

* commit '41893d65097804eda078f29bc269c3694b6341be':
  Force work challenge activity to be not resizable

Change-Id: I8b453cd1676ace63601e5b67df22eb47030e1c35
2016-04-18 15:47:53 +00:00
Tony Mak
f9ccc6f35b Merge "Force work challenge activity to be not resizable" into nyc-dev
am: 06a1d61

* commit '06a1d61626e805c815bc97ea43cd0017612211f5':
  Force work challenge activity to be not resizable

Change-Id: I5d9fac7de1eb2760717c4467ccddc5001e379513
2016-04-18 15:43:14 +00:00
Tony Mak
41893d6509 Merge "Force work challenge activity to be not resizable" into nyc-dev
am: 06a1d61

* commit '06a1d61626e805c815bc97ea43cd0017612211f5':
  Force work challenge activity to be not resizable

Change-Id: Ic54a1afcd474ba87404e80571598e9a77e4b430e
2016-04-18 15:43:07 +00:00
shwetachahar
d6fb2cd724 Set the minimum speech rate to a value of ten instead of zero.
Bug: 27093805
Change-Id: I090a9345c3b05937d1f790ea051945ac187ddb61
2016-04-18 16:39:53 +01:00
Tony Mak
06a1d61626 Merge "Force work challenge activity to be not resizable" into nyc-dev 2016-04-18 15:35:11 +00:00
Shweta Chahar
335d9fee62 Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
am: cea65a4

* commit 'cea65a460bfdb2c1f8e5feed063ed76d63df2a49':

Change-Id: I25cfa4a6303852f211c6d61ec2285320b70c19ae
2016-04-18 15:30:31 +00:00
Shweta Chahar
a961b006c4 Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea
am: 3cf8d61

* commit '3cf8d6145843adac6e0b8eec33aa152995118c7a':
  Add a button to reset pitch to default value.

Change-Id: I0490f1562f5b1d68a82a7f2f9ec9e279e99ffc12
2016-04-18 15:27:14 +00:00
shwetachahar
3cf8d61458 Merge "Add a button to reset pitch to default value." into nyc-dev
am: da4ecea

* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
  Add a button to reset pitch to default value.

Change-Id: Ib8be9f4d0d5ff5b2a028ab83df3b271b6377b30c
2016-04-18 15:22:54 +00:00
shwetachahar
cea65a460b Merge "Add a button to reset pitch to default value." into nyc-dev
am: da4ecea

* commit 'da4ecea84517b4071bef3ae6c6b1eb180a890008':
  Add a button to reset pitch to default value.

Change-Id: I3188a3de81683638efc236ddea5391685a0c565a
2016-04-18 15:22:47 +00:00
Shweta Chahar
da4ecea845 Merge "Add a button to reset pitch to default value." into nyc-dev 2016-04-18 15:14:24 +00:00
Shweta Chahar
3461d06b2a Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev am: abef602
am: a4ae307

* commit 'a4ae3073abe74766c12813e8723cc8d28b8dcb4e':

Change-Id: Ibb497c0e5265cf6597e90cda94550d39dcc8223f
2016-04-18 15:10:14 +00:00
Shweta Chahar
94e6245a80 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev am: abef602
am: 82f3228

* commit '82f32288c124ca5dfed87199931a390ba86e621e':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I786bad2629688e065972b5fa8dc8d19c06cc350f
2016-04-18 15:09:58 +00:00
shwetachahar
82f32288c1 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev
am: abef602

* commit 'abef602337c8d362021ebeaf081ff3ca8a2a61f8':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I2fae21bd484ef457b86494ca9e95742c48a03d10
2016-04-18 15:04:55 +00:00
shwetachahar
a4ae3073ab Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev
am: abef602

* commit 'abef602337c8d362021ebeaf081ff3ca8a2a61f8':
  Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called.

Change-Id: I3f870ed496e86180c3a14b490e6472007230e0e6
2016-04-18 15:04:53 +00:00
Shweta Chahar
abef602337 Merge "Replace the try catch block for retrieving pitch and speech rate values from secure settings with getInt() supplied with a default arg. Also, set the pitch and speech rate of the TTS engine to the default rate and pitch when initSetting() is called." into nyc-dev 2016-04-18 14:56:51 +00:00
Keisuke Kuroyanagi
c7fc075e12 Fix: Spell checker cannot be re-enabled.
Without this CL, preference for enabling spell checking is disabled
when spell checking is disabled.
This issue makes it impossible to re-enable spell checking from the
settings UI.
This was introduced in I0ed71bbb580e3547d97e321799ac2b77b1f284a3
that fixes Bug: 26685795.

Bug: 28157871
Change-Id: I386baf2dd79347c1202f885a3f749aea3fb6a58d
2016-04-17 18:09:28 +09:00
Yohei Yukawa
2cae5b8952 Use IME service logo or icon if exists.
With this CL, AvailableVirtualKeyboardFragment searches icon resource in
the following order, which makes it easier to find a certain IME when
one APK contains multiple IMEs.
 1. Service Logo
 2. Service Icon
 3. Application Logo
 4. Application Icon

Bug: 28204635
Change-Id: I406ccc0d53e6ec69793c2fc8be8c6c1c90b34811
2016-04-16 15:52:06 +00:00
Sudheer Shanka
c258a3dd41 Fix NullPointerException in Utils.copyMeProfilePhoto.
am: 39975a6

* commit '39975a60cc0953da058bbfa33c16007f763f5498':
  Fix NullPointerException in Utils.copyMeProfilePhoto.

Change-Id: I3fb15ca1afb2f0887767ee9a63314d19c1642eb0
2016-04-16 01:47:20 +00:00
Sudheer Shanka
39975a60cc Fix NullPointerException in Utils.copyMeProfilePhoto.
Bug: 28221898
Change-Id: I2f67c4ba349a1c831b22174fefd0db6efeffbf1e
2016-04-15 17:21:41 -07:00
Keisuke Kuroyanagi
de251d9713 Fix: SpellChecker subtype label cannot be updated.
"Use system languages" is always displayed independent from the
selected value.
This happens due to inverted if-condition that has been introduced in
I0ed71bbb580e3547d97e321799ac2b77b1f284a3

Bug: 28204608
Change-Id: I9f0390242cb5ed4960c06eb3d0a4ade7a66143a5
2016-04-16 09:16:24 +09:00
Ido Ofir
5a9cff708f Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
am: 7f4892f

* commit '7f4892f223ec265fdee5223fdec92440849160ac':
  Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.

Change-Id: Iacab34944705d4ad8e49d9b32fecdfa0cc9cd40b
2016-04-15 23:24:34 +00:00
Ido Ofir
7f4892f223 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev 2016-04-15 23:16:51 +00:00
Ido Ofir
81513d7a88 Changing dimensions and margins for fingerprint image in portrait mode.
Landscape layout remains the same with fixed size.

Bug: 27875410

Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67
2016-04-15 13:30:01 -07:00
Mihai Nita
7b5e52bf9e Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev
am: 50669fa

* commit '50669fa3e8774e1707ddf072c645629359ada9ec':
  Fix checkboxes and warning dialog lost when device rotates

Change-Id: Id4f7d65e987f1c340898d1c1136260b0b1d72c4f
2016-04-15 18:56:48 +00:00
Mihai Niță
50669fa3e8 Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev 2016-04-15 18:44:19 +00:00
Felipe Leme
4012ca7182 Merge "Add metrics for Data Saver actions." into nyc-dev
am: 2ed2158

* commit '2ed21582367a52bf021a4337d549e64a20c1d02b':
  Add metrics for Data Saver actions.

Change-Id: I9634aa77870a28287672130f453b9b83c9ea6dd1
2016-04-15 18:08:37 +00:00
TreeHugger Robot
2ed2158236 Merge "Add metrics for Data Saver actions." into nyc-dev 2016-04-15 17:53:41 +00:00
Jason Monk
951ee5b594 Merge ""Fix" search" into nyc-dev
am: 15310bb

* commit '15310bbb2f1fac136dfbb62d43babf4a80483fa5':
  "Fix" search

Change-Id: Id414ce87a468111799ca5222c4650af14d6f025c
2016-04-15 16:10:23 +00:00
Makoto Onuki
513c783b39 Merge "Don\'t allow removing admin to be added again" into nyc-dev
am: 547fc39

* commit '547fc3983edc67a9abf28b628fcb0b9bd0be2415':
  Don't allow removing admin to be added again

Change-Id: Ib44dc27ab2be9c0bd8298162cf64776090021d35
2016-04-15 16:07:14 +00:00
Jason Monk
15310bbb2f Merge ""Fix" search" into nyc-dev 2016-04-15 16:06:47 +00:00
Makoto Onuki
547fc3983e Merge "Don't allow removing admin to be added again" into nyc-dev 2016-04-15 16:05:21 +00:00
shwetachahar
87f3e11da1 Replace the try catch block for retrieving pitch and speech rate
values from secure settings with getInt() supplied with a default
arg.
Also, set the pitch and speech rate of the TTS engine to the
default rate and pitch when initSetting() is called.

Bug: 27916665
Bug: 27871182
Change-Id: Ie772ee6f29d40774f70e73fe091f6f884472e2f8
2016-04-15 16:48:17 +01:00
Julia Reynolds
29eeaf9530 Merge "Notification slider changes." into nyc-dev
am: 8b01df5

* commit '8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
  Notification slider changes.

Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997
2016-04-15 15:32:17 +00:00
Julia Reynolds
8b01df5d78 Merge "Notification slider changes." into nyc-dev 2016-04-15 15:20:21 +00:00
Zoltan Szatmary-Ban
3f6208170d Apply policy transparency to HotspotCondition and WiFi settings...
...when there is an active hotspot and user restriction for disallowing
tether config is in effect. This is to avoid getting security exceptions
from WifiManager when engaging with HotspotCondition or Wifi enable switch.

Bug:27936528
Change-Id: Ib3324e853277c177966b55668758d349ffe6ecf5
2016-04-15 16:13:27 +01:00
Julia Reynolds
088fb52ef8 Notification slider changes.
Bug: 27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
2016-04-15 11:04:13 -04:00
shwetachahar
aaf9df3b19 Add a button to reset pitch to default value.
Bug: 27949093
Change-Id: Ia7fd2f824b8e87c08f9e2f3defca6e645c5c1bfb
2016-04-15 15:56:13 +01:00