Commit Graph

26955 Commits

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

* commit '4452d42016271e7b81e3143840744a4f08ee32c0':

Change-Id: I189f00fcb6249ceec170212ec8e6f7739feb6367
2016-04-18 19:30:13 +00:00
Yohei Yukawa
67366ac535 Merge "Use IME service logo or icon if exists." into nyc-dev am: bd06816 am: fb9ff81
am: 8de5e7d

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

Change-Id: I27d8213d15c86e996b7c3640eea6a87efe5795cc
2016-04-18 19:30:12 +00:00
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
Andrew Sapperstein
e8f1dd9eab Merge "Remove ToastController." 2016-04-18 18:46:46 +00:00
Shweta Chahar
96d1ed170a 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
am: 28d3130

* commit '28d31300a48700615470cc01c7604de4fb632571':

Change-Id: Ie89c90c2f601a54a525dbaba2b087660df78fc35
2016-04-18 18:41:44 +00:00
shwetachahar
ca5e72e43d Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev am: 8852b82 am: c01beed
am: 57c1b9c

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

Change-Id: Ibb93c92f04a2b7266918c746c382e2d4aef0f01d
2016-04-18 18:41:43 +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
Daniel Nishi
781ad72bc7 Merge "Add a deletion helper view for clearing space." 2016-04-18 16:43:26 +00:00
Tony Mak
6483b06e70 Merge "Force work challenge activity to be not resizable" into nyc-dev am: 06a1d61 am: f9ccc6f
am: 01da5b4

* commit '01da5b4ed6fb2fdbb0dec41f965eb4b3e49598bb':

Change-Id: I7d86a6f62b2568a806557bc88db43248970f3ee9
2016-04-18 16:01:11 +00:00
Tony Mak
fbbff5783f Merge "Force work challenge activity to be not resizable" into nyc-dev am: 06a1d61 am: 41893d6
am: 8af909e

* commit '8af909ed9465bc69ed58c4d880660f8885322b5a':
  Force work challenge activity to be not resizable

Change-Id: Icb90f5f2ebf9c9578ac56cf739099b36a63073ba
2016-04-18 16:01:11 +00: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
shwetachahar
e8424501e4 Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am: cea65a4
am: 335d9fe

* commit '335d9fee62a1eb133cb3d2317bef1305b0874edb':

Change-Id: I25559c455ca6a33caad9d4352377484383aaed32
2016-04-18 15:34:25 +00:00
shwetachahar
3f7c85eb79 Merge "Add a button to reset pitch to default value." into nyc-dev am: da4ecea am: 3cf8d61
am: a961b00

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

Change-Id: I87f2d329fd04a57e3cb3af5e734227064a3fea93
2016-04-18 15:34:24 +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
shwetachahar
ed66c9ff21 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
am: 3461d06

* commit '3461d06b2af5364bb89798dc83fd6b564c1980dc':

Change-Id: I867f574d7ed71cecffc2cdcbfff06c49645aa73f
2016-04-18 15:15:01 +00:00
shwetachahar
dd49d0308d 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
am: 94e6245

* commit '94e6245a809cd5b8e8bef25f36fb1ebd841ab447':
  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: I78cbd3a39973e38d81640b994858690e6e90c8ae
2016-04-18 15:15:01 +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
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
29094b2eba Fix NullPointerException in Utils.copyMeProfilePhoto. am: 39975a6
am: c258a3d

* commit 'c258a3dd4129eacc6a69847871b8f7bfa8a6e266':
  Fix NullPointerException in Utils.copyMeProfilePhoto.

Change-Id: I179eb6365ff2ea9eb396160e179838f4276f2199
2016-04-16 01:49:54 +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
Ido Ofir
f472716ba2 Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev am: 7f4892f
am: 5a9cff7

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

Change-Id: I12d6c2c7fe63f1bc7a3a6798a3070f8cef2bf541
2016-04-15 23:29:13 +00: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 Niță
c3e8ae2e6f Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev am: 50669fa
am: 7b5e52b

* commit '7b5e52bf9e0866f0391b25f94efef4a13677ccbd':
  Fix checkboxes and warning dialog lost when device rotates

Change-Id: Ic212a06cbd8838421443ee7dfb7a4fe8b9ad037a
2016-04-15 19:06:49 +00: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