Commit Graph

26442 Commits

Author SHA1 Message Date
Jason Monk
fec910e998 Merge "Guard against app info crash" into nyc-dev am: c3ab03e
am: 8379c3f

* commit '8379c3f603628ebcdfface78643e8fffe3fe08b8':
  Guard against app info crash

Change-Id: I4d5434eaa5770b6582878f5e593086e82e991eaf
2016-04-19 13:51:01 +00:00
Jason Monk
8379c3f603 Merge "Guard against app info crash" into nyc-dev
am: c3ab03e

* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
  Guard against app info crash

Change-Id: Id1cea6852ef79ddaafb79764c8c4c18cf077d0c5
2016-04-19 13:45:31 +00:00
Jason Monk
c3ab03ecdb Merge "Guard against app info crash" into nyc-dev 2016-04-19 13:38:38 +00:00
Android Build Merger (Role)
b927b145af Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106 am: 9c8d099" into nyc-mr1-dev-plus-aosp 2016-04-19 13:35:30 +00:00
Zoltan Szatmary-Ban
55460e3a7d Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106
am: 9c8d099

* commit '9c8d099f440abad2eacb150ebd225689cc87021e':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I81895bb3e3e53229241f3673d6c71b070d9c639e
2016-04-19 13:35:21 +00:00
Zoltan Szatmary-Ban
c82afdc5dc Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am: 295f106
am: f89218e

* commit 'f89218e2812e702567d78aa5459cde1877d4c0e2':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ib9717c52c2c9356d81cb48cdf5e24f7a64ce35fd
2016-04-19 13:35:20 +00:00
Zoltan Szatmary-Ban
f89218e281 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836
2016-04-19 13:32:20 +00:00
Zoltan Szatmary-Ban
9c8d099f44 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: I97559de43f49df91af5f8ef1c9a2bd6c968f7f0e
2016-04-19 13:32:19 +00:00
Zoltan Szatmary-Ban
295f1060e9 Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev 2016-04-19 13:25:22 +00:00
Android Build Merger (Role)
44dea6cbc2 Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1 am: 5749a18" into nyc-mr1-dev-plus-aosp 2016-04-19 11:06:20 +00:00
Abodunrinwa Toki
ea91db989b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1
am: 5749a18

* commit '5749a18b8c0934dc727784dc6346a89379b7dcbf':
  Input Settings: Change the 'add' icon.

Change-Id: I12d2f6d99b91b1e4c283359cfb6eb866e259132b
2016-04-19 11:06:11 +00:00
Abodunrinwa Toki
8d0c5fa82b Merge "Input Settings: Change the \'add\' icon." into nyc-dev am: 8aa7cf1
am: f0fa52e

* commit 'f0fa52ea6824eac7cd961023b8fcc0cdde9e0c27':
  Input Settings: Change the 'add' icon.

Change-Id: I9d6c03250f8f7df566c1665c187d055c13ef4a26
2016-04-19 11:06:10 +00:00
Abodunrinwa Toki
f0fa52ea68 Merge "Input Settings: Change the \'add\' icon." into nyc-dev
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: Ic7d0870e1862a2ff378832b1600075d3aec6f059
2016-04-19 11:03:17 +00:00
Abodunrinwa Toki
5749a18b8c Merge "Input Settings: Change the \'add\' icon." into nyc-dev
am: 8aa7cf1

* commit '8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
  Input Settings: Change the 'add' icon.

Change-Id: I1f783e46cc86e1992bf345f900acc1dc720113dd
2016-04-19 11:03:17 +00:00
Abodunrinwa Toki
8aa7cf1631 Merge "Input Settings: Change the 'add' icon." into nyc-dev 2016-04-19 10:56:35 +00:00
Android Build Merger (Role)
1101b8e85e Merge "Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab am: 0ed84f4" into nyc-mr1-dev-plus-aosp 2016-04-19 04:24:49 +00:00
Keisuke Kuroyanagi
482bd60cbf Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab
am: 7a1480f

* commit '7a1480f162b05315e26fcd04295ca6c11f364b72':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I4f8749044aa3e3c1f5f79eda8d2f3acecdf54083
2016-04-19 04:24:39 +00:00
Keisuke Kuroyanagi
e1a29c90df Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am: 23f7dab
am: 0ed84f4

* commit '0ed84f431a13b6e3098b5c62c895b660d67abb4e':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: Ic2fa6c225ba844cef7abee913ac931f8578bd807
2016-04-19 04:24:39 +00:00
Keisuke Kuroyanagi
0ed84f431a Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
am: 23f7dab

* commit '23f7dab2b6ec7c763dc873314da38bd918f4161e':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I75798e2d7211c8161bda142223d4f1be0d2e005c
2016-04-19 04:22:08 +00:00
Keisuke Kuroyanagi
7a1480f162 Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
am: 23f7dab

* commit '23f7dab2b6ec7c763dc873314da38bd918f4161e':
  Fix: SpellChecker subtype label cannot be updated.

Change-Id: I8bb2d31c8dc17d7b4bcb8a840dadf1cd442bd5ad
2016-04-19 04:22:07 +00:00
Keisuke Kuroyanagi
23f7dab2b6 Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev 2016-04-19 04:17:02 +00:00
Felipe Leme
c7f2887715 Handle blacklisted apps on Data Saver whitelist. am: c2ef27f
am: 90a3102

* commit '90a3102abd5408c0b355a495ef1cba0547c81c34':

Change-Id: If8c68de1d00f1bc08f5d3f9ace387bda8e757651
2016-04-18 22:50:14 +00:00
Felipe Leme
52e92fd6c4 Handle blacklisted apps on Data Saver whitelist. am: c2ef27f
am: 004a33f

* commit '004a33f8e9bb66cfd0bcaf1e1aa8d4c238be45e5':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia71178dfff5f27ff495cf5b5f884383ac15607d8
2016-04-18 22:42:43 +00:00
Felipe Leme
90a3102abd Handle blacklisted apps on Data Saver whitelist.
am: c2ef27f

* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia221750b24003af71c6dd106b1247d7178573cf4
2016-04-18 22:38:41 +00:00
Felipe Leme
004a33f8e9 Handle blacklisted apps on Data Saver whitelist.
am: c2ef27f

* commit 'c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
  Handle blacklisted apps on Data Saver whitelist.

Change-Id: Ia5027825b7292f15717a47ed82f242f252ac83d9
2016-04-18 22:38:26 +00:00
Felipe Leme
c2ef27faf4 Handle blacklisted apps on Data Saver whitelist.
When user blacklists an app for background data access, the
"Unrestricted data access" list should not display the whitelist toggle
option, but rather explain background access is turned off and offer the
option to open the app's data usage screen to turn it back on.

It still does not handle changed received by DataSaverBackend, so the UI
will be stale when the user removes a blacklist and navigates back to
the list.

BUG: 27481520

Change-Id: I9d0fa9f0180a69ce9bd1417921bf89ec3ba31f01
2016-04-18 13:14:01 -07:00
Jason Monk
198d9f1cba Guard against app info crash
Change-Id: Ifb52ec61718723202e5ec7da5f9723a4764968ba
Fixes: 28171829
2016-04-18 15:47:01 -04: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
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
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