OSDN Git Service
Victor Chang [Tue, 19 Apr 2016 18:42:48 +0000 (18:42 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am:
04a01b7
am:
f766cc8
* commit '
f766cc83951fff0c26ca57b074693ef8a4775283':
Remove reference to @string/ssl_ca_cert_dialog_title
Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0
Victor Chang [Tue, 19 Apr 2016 18:39:11 +0000 (18:39 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
am:
04a01b7
* commit '
04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
Remove reference to @string/ssl_ca_cert_dialog_title
Change-Id: I83917e8e6ecf29456a4559b3540e64540ddde144
Jason Monk [Tue, 19 Apr 2016 18:31:38 +0000 (18:31 +0000)]
Merge "Fix account screen in split screen" into nyc-dev am:
43059b7
am:
7e62eef
* commit '
7e62eef4eff6b25f146cacd584355678f11f8b99':
Change-Id: Ibd3440f753cab510c7db9b506b4fbc5e43828e67
Jason Monk [Tue, 19 Apr 2016 18:29:40 +0000 (18:29 +0000)]
Merge "Fix account screen in split screen" into nyc-dev am:
43059b7
am:
4619c9c
* commit '
4619c9cf4a37a510d646321eba670c831ee5f703':
Fix account screen in split screen
Change-Id: I34a6c6f43a511212c851ace8e551e23c6d640832
Victor Chang [Tue, 19 Apr 2016 18:29:15 +0000 (18:29 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 18:22:29 +0000 (18:22 +0000)]
Merge "Fix account screen in split screen" into nyc-dev
am:
43059b7
* commit '
43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
Jason Monk [Tue, 19 Apr 2016 18:22:21 +0000 (18:22 +0000)]
Merge "Fix account screen in split screen" into nyc-dev
am:
43059b7
* commit '
43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: I7e422356106307ef827f04a2147a7978bd6d81d6
Noah Wang [Tue, 19 Apr 2016 18:14:24 +0000 (18:14 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996" into nyc-dev am:
4f63bb6
am:
9359e0f
* commit '
9359e0f9691664df3ac9d74759ad4e90c38266e3':
Change-Id: Ie294eb37d3ef9e6d420b41f501d28c45f02e4bab
Noah Wang [Tue, 19 Apr 2016 18:11:09 +0000 (18:11 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996" into nyc-dev am:
4f63bb6
am:
1c94e6d
* commit '
1c94e6dd90288d16a1ea2b2d132f5b7e4c2f7ddc':
Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996
Change-Id: If80159aeef6a321f7c278700db217b6491a9a3d4
Jason Monk [Tue, 19 Apr 2016 18:09:27 +0000 (18:09 +0000)]
Merge "Fix account screen in split screen" into nyc-dev
Noah Wang [Tue, 19 Apr 2016 18:07:20 +0000 (18:07 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996" into nyc-dev
am:
4f63bb6
* commit '
4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996
Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9
Noah Wang [Tue, 19 Apr 2016 18:07:08 +0000 (18:07 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996" into nyc-dev
am:
4f63bb6
* commit '
4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996
Change-Id: I0ed40edbd65890426f07e38a36369592b29ddb01
Jason Monk [Tue, 19 Apr 2016 18:05:19 +0000 (14:05 -0400)]
Fix account screen in split screen
Don't remove all prefs in on pause, because why would you...
Change-Id: I9139dabf917b05860e738dc0b2aa19df8f983a7e
Fixes:
27987782
Noah Wang [Tue, 19 Apr 2016 17:56:49 +0000 (17:56 +0000)]
Merge "Fix preview screen crashing and glitches for Display / Font size Bug:
28223545 Bug:
28223533 Bug:
28210654 Bug:
28210242 Bug:
28208955 Bug:
27699996" into nyc-dev
Victor Chang [Tue, 19 Apr 2016 16:45:07 +0000 (17:45 +0100)]
Remove reference to @string/ssl_ca_cert_dialog_title
Bug:
28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b
Android Build Merger (Role) [Tue, 19 Apr 2016 13:51:11 +0000 (13:51 +0000)]
Merge "Merge "Guard against app info crash" into nyc-dev am:
c3ab03e am:
9f6fcdf" into nyc-mr1-dev-plus-aosp
Jason Monk [Tue, 19 Apr 2016 13:51:02 +0000 (13:51 +0000)]
Merge "Guard against app info crash" into nyc-dev am:
c3ab03e
am:
9f6fcdf
* commit '
9f6fcdf0d7cda838a9072f7c912fd5a5b6bb5129':
Guard against app info crash
Change-Id: Iac16ff08c6fe12acbce8cb9ccf0401fcf2722690
Jason Monk [Tue, 19 Apr 2016 13:51:01 +0000 (13:51 +0000)]
Merge "Guard against app info crash" into nyc-dev am:
c3ab03e
am:
8379c3f
* commit '
8379c3f603628ebcdfface78643e8fffe3fe08b8':
Guard against app info crash
Change-Id: I4d5434eaa5770b6582878f5e593086e82e991eaf
Jason Monk [Tue, 19 Apr 2016 13:45:31 +0000 (13:45 +0000)]
Merge "Guard against app info crash" into nyc-dev
am:
c3ab03e
* commit '
c3ab03ecdb505114770cbb87b61457fabf75847f':
Guard against app info crash
Change-Id: Id1cea6852ef79ddaafb79764c8c4c18cf077d0c5
Jason Monk [Tue, 19 Apr 2016 13:45:18 +0000 (13:45 +0000)]
Merge "Guard against app info crash" into nyc-dev
am:
c3ab03e
* commit '
c3ab03ecdb505114770cbb87b61457fabf75847f':
Guard against app info crash
Change-Id: I313465d83efc950527b1634e2bc6609e6ea8e7cf
Jason Monk [Tue, 19 Apr 2016 13:38:38 +0000 (13:38 +0000)]
Merge "Guard against app info crash" into nyc-dev
Android Build Merger (Role) [Tue, 19 Apr 2016 13:35:30 +0000 (13:35 +0000)]
Merge "Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev am:
295f106 am:
9c8d099" into nyc-mr1-dev-plus-aosp
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:35:21 +0000 (13:35 +0000)]
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
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:35:20 +0000 (13:35 +0000)]
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
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:32:20 +0000 (13:32 +0000)]
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
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:32:19 +0000 (13:32 +0000)]
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
Zoltan Szatmary-Ban [Tue, 19 Apr 2016 13:25:22 +0000 (13:25 +0000)]
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
Android Build Merger (Role) [Tue, 19 Apr 2016 11:06:20 +0000 (11:06 +0000)]
Merge "Merge "Input Settings: Change the \'add\' icon." into nyc-dev am:
8aa7cf1 am:
5749a18" into nyc-mr1-dev-plus-aosp
Abodunrinwa Toki [Tue, 19 Apr 2016 11:06:11 +0000 (11:06 +0000)]
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
Abodunrinwa Toki [Tue, 19 Apr 2016 11:06:10 +0000 (11:06 +0000)]
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
Abodunrinwa Toki [Tue, 19 Apr 2016 11:03:17 +0000 (11:03 +0000)]
Merge "Input Settings: Change the \'add\' icon." into nyc-dev
am:
8aa7cf1
* commit '
8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
Input Settings: Change the 'add' icon.
Change-Id: Ic7d0870e1862a2ff378832b1600075d3aec6f059
Abodunrinwa Toki [Tue, 19 Apr 2016 11:03:17 +0000 (11:03 +0000)]
Merge "Input Settings: Change the \'add\' icon." into nyc-dev
am:
8aa7cf1
* commit '
8aa7cf16310366b48489f3d3a7a4acd0fa47b8a1':
Input Settings: Change the 'add' icon.
Change-Id: I1f783e46cc86e1992bf345f900acc1dc720113dd
Abodunrinwa Toki [Tue, 19 Apr 2016 10:56:34 +0000 (10:56 +0000)]
Merge "Input Settings: Change the 'add' icon." into nyc-dev
Android Build Merger (Role) [Tue, 19 Apr 2016 04:24:49 +0000 (04:24 +0000)]
Merge "Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev am:
23f7dab am:
0ed84f4" into nyc-mr1-dev-plus-aosp
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:24:39 +0000 (04:24 +0000)]
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
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:24:39 +0000 (04:24 +0000)]
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
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:22:08 +0000 (04:22 +0000)]
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
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:22:07 +0000 (04:22 +0000)]
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
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:17:02 +0000 (04:17 +0000)]
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
Felipe Leme [Mon, 18 Apr 2016 22:50:14 +0000 (22:50 +0000)]
Handle blacklisted apps on Data Saver whitelist. am:
c2ef27f
am:
90a3102
* commit '
90a3102abd5408c0b355a495ef1cba0547c81c34':
Change-Id: If8c68de1d00f1bc08f5d3f9ace387bda8e757651
Felipe Leme [Mon, 18 Apr 2016 22:42:43 +0000 (22:42 +0000)]
Handle blacklisted apps on Data Saver whitelist. am:
c2ef27f
am:
004a33f
* commit '
004a33f8e9bb66cfd0bcaf1e1aa8d4c238be45e5':
Handle blacklisted apps on Data Saver whitelist.
Change-Id: Ia71178dfff5f27ff495cf5b5f884383ac15607d8
Felipe Leme [Mon, 18 Apr 2016 22:38:41 +0000 (22:38 +0000)]
Handle blacklisted apps on Data Saver whitelist.
am:
c2ef27f
* commit '
c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
Handle blacklisted apps on Data Saver whitelist.
Change-Id: Ia221750b24003af71c6dd106b1247d7178573cf4
Felipe Leme [Mon, 18 Apr 2016 22:38:26 +0000 (22:38 +0000)]
Handle blacklisted apps on Data Saver whitelist.
am:
c2ef27f
* commit '
c2ef27faf4afca6c4f6634b5de975a1bdadf0752':
Handle blacklisted apps on Data Saver whitelist.
Change-Id: Ia5027825b7292f15717a47ed82f242f252ac83d9
Felipe Leme [Fri, 15 Apr 2016 00:53:07 +0000 (17:53 -0700)]
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
Noah Wang [Fri, 15 Apr 2016 20:49:12 +0000 (13:49 -0700)]
Fix preview screen crashing and glitches for
Display / Font size
Bug:
28223545
Bug:
28223533
Bug:
28210654
Bug:
28210242
Bug:
28208955
Bug:
27699996
Change-Id: I80339dabbd089db8a6c6a80645baabb9b4cad00e
Jason Monk [Mon, 18 Apr 2016 19:47:01 +0000 (15:47 -0400)]
Guard against app info crash
Change-Id: Ifb52ec61718723202e5ec7da5f9723a4764968ba
Fixes:
28171829
Yohei Yukawa [Mon, 18 Apr 2016 19:29:40 +0000 (19:29 +0000)]
Merge "Use IME service logo or icon if exists." into nyc-dev am:
bd06816
am:
47e43e0
* commit '
47e43e0f0dbbbe5919ea1799a0b206802cfda1ac':
Change-Id: I3f867b1645b869f0af4e71452870013f598881a0
Yohei Yukawa [Mon, 18 Apr 2016 19:24:22 +0000 (19:24 +0000)]
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
Yohei Yukawa [Mon, 18 Apr 2016 19:19:02 +0000 (19:19 +0000)]
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
Yohei Yukawa [Mon, 18 Apr 2016 19:18:58 +0000 (19:18 +0000)]
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
Yohei Yukawa [Mon, 18 Apr 2016 19:01:27 +0000 (19:01 +0000)]
Merge "Use IME service logo or icon if exists." into nyc-dev
Android Build Merger (Role) [Mon, 18 Apr 2016 18:35:31 +0000 (18:35 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 18:35:26 +0000 (18:35 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 18:35:20 +0000 (18:35 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 18:29:47 +0000 (18:29 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 18:29:46 +0000 (18:29 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 18:20:58 +0000 (18:20 +0000)]
Merge "Set the minimum speech rate to a value of ten instead of zero." into nyc-dev
Tony Mak [Mon, 18 Apr 2016 15:50:29 +0000 (15:50 +0000)]
Merge "Force work challenge activity to be not resizable" into nyc-dev am:
06a1d61
am:
f9ccc6f
* commit '
f9ccc6f35bf71f47ef4622fc18e41e79cacd1a61':
Change-Id: Ie49615ea722a7afdaff0a91739855c0b6503fb2e
Tony Mak [Mon, 18 Apr 2016 15:47:53 +0000 (15:47 +0000)]
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
Tony Mak [Mon, 18 Apr 2016 15:43:14 +0000 (15:43 +0000)]
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
Tony Mak [Mon, 18 Apr 2016 15:43:07 +0000 (15:43 +0000)]
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
shwetachahar [Fri, 15 Apr 2016 15:40:37 +0000 (16:40 +0100)]
Set the minimum speech rate to a value of ten instead of zero.
Bug:
27093805
Change-Id: I090a9345c3b05937d1f790ea051945ac187ddb61
Tony Mak [Mon, 18 Apr 2016 15:35:10 +0000 (15:35 +0000)]
Merge "Force work challenge activity to be not resizable" into nyc-dev
Shweta Chahar [Mon, 18 Apr 2016 15:30:31 +0000 (15:30 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev am:
da4ecea
am:
cea65a4
* commit '
cea65a460bfdb2c1f8e5feed063ed76d63df2a49':
Change-Id: I25cfa4a6303852f211c6d61ec2285320b70c19ae
Shweta Chahar [Mon, 18 Apr 2016 15:27:14 +0000 (15:27 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 15:22:54 +0000 (15:22 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 15:22:47 +0000 (15:22 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 15:14:24 +0000 (15:14 +0000)]
Merge "Add a button to reset pitch to default value." into nyc-dev
Shweta Chahar [Mon, 18 Apr 2016 15:10:14 +0000 (15:10 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 15:09:58 +0000 (15:09 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 15:04:55 +0000 (15:04 +0000)]
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
shwetachahar [Mon, 18 Apr 2016 15:04:53 +0000 (15:04 +0000)]
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
Shweta Chahar [Mon, 18 Apr 2016 14:56:51 +0000 (14:56 +0000)]
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
Yohei Yukawa [Fri, 15 Apr 2016 11:03:38 +0000 (04:03 -0700)]
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
Sudheer Shanka [Sat, 16 Apr 2016 01:47:20 +0000 (01:47 +0000)]
Fix NullPointerException in Utils.copyMeProfilePhoto.
am:
39975a6
* commit '
39975a60cc0953da058bbfa33c16007f763f5498':
Fix NullPointerException in Utils.copyMeProfilePhoto.
Change-Id: I3fb15ca1afb2f0887767ee9a63314d19c1642eb0
Sudheer Shanka [Sat, 16 Apr 2016 00:20:54 +0000 (17:20 -0700)]
Fix NullPointerException in Utils.copyMeProfilePhoto.
Bug:
28221898
Change-Id: I2f67c4ba349a1c831b22174fefd0db6efeffbf1e
Keisuke Kuroyanagi [Sat, 16 Apr 2016 00:13:15 +0000 (09:13 +0900)]
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
Ido Ofir [Fri, 15 Apr 2016 23:24:34 +0000 (23:24 +0000)]
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
Ido Ofir [Fri, 15 Apr 2016 23:16:50 +0000 (23:16 +0000)]
Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
Ido Ofir [Thu, 14 Apr 2016 21:31:25 +0000 (14:31 -0700)]
Changing dimensions and margins for fingerprint image in portrait mode.
Landscape layout remains the same with fixed size.
Bug:
27875410
Change-Id: I82ee12ef5efab8bee6a0e187810b399cb45b7f67
Mihai Nita [Fri, 15 Apr 2016 18:56:48 +0000 (18:56 +0000)]
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
Mihai Niță [Fri, 15 Apr 2016 18:44:19 +0000 (18:44 +0000)]
Merge "Fix checkboxes and warning dialog lost when device rotates" into nyc-dev
Felipe Leme [Fri, 15 Apr 2016 18:08:37 +0000 (18:08 +0000)]
Merge "Add metrics for Data Saver actions." into nyc-dev
am:
2ed2158
* commit '
2ed21582367a52bf021a4337d549e64a20c1d02b':
Add metrics for Data Saver actions.
Change-Id: I9634aa77870a28287672130f453b9b83c9ea6dd1
TreeHugger Robot [Fri, 15 Apr 2016 17:53:40 +0000 (17:53 +0000)]
Merge "Add metrics for Data Saver actions." into nyc-dev
Jason Monk [Fri, 15 Apr 2016 16:10:23 +0000 (16:10 +0000)]
Merge ""Fix" search" into nyc-dev
am:
15310bb
* commit '
15310bbb2f1fac136dfbb62d43babf4a80483fa5':
"Fix" search
Change-Id: Id414ce87a468111799ca5222c4650af14d6f025c
Makoto Onuki [Fri, 15 Apr 2016 16:07:14 +0000 (16:07 +0000)]
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
Jason Monk [Fri, 15 Apr 2016 16:06:47 +0000 (16:06 +0000)]
Merge ""Fix" search" into nyc-dev
Makoto Onuki [Fri, 15 Apr 2016 16:05:21 +0000 (16:05 +0000)]
Merge "Don't allow removing admin to be added again" into nyc-dev
shwetachahar [Fri, 15 Apr 2016 13:25:07 +0000 (14:25 +0100)]
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
Julia Reynolds [Fri, 15 Apr 2016 15:32:17 +0000 (15:32 +0000)]
Merge "Notification slider changes." into nyc-dev
am:
8b01df5
* commit '
8b01df5d7869b392ad542b5c27fe8dd21b8759ba':
Notification slider changes.
Change-Id: Ibb5c1fc046096c0c1b3c04367d95b557d2291997
Julia Reynolds [Fri, 15 Apr 2016 15:20:21 +0000 (15:20 +0000)]
Merge "Notification slider changes." into nyc-dev
Zoltan Szatmary-Ban [Mon, 11 Apr 2016 18:56:03 +0000 (19:56 +0100)]
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
Julia Reynolds [Thu, 7 Apr 2016 00:32:23 +0000 (20:32 -0400)]
Notification slider changes.
Bug:
27558254
Change-Id: I15635ae19e82a57d6e6fcb2f8f946f31bebf5d0f
shwetachahar [Fri, 15 Apr 2016 14:56:13 +0000 (15:56 +0100)]
Add a button to reset pitch to default value.
Bug:
27949093
Change-Id: Ia7fd2f824b8e87c08f9e2f3defca6e645c5c1bfb
Benjamin Franz [Fri, 15 Apr 2016 14:55:11 +0000 (14:55 +0000)]
Merge "Only try disabling quiet mode" into nyc-dev
am:
89726fd
* commit '
89726fd95209689dea1f82912e85c837fbeb8553':
Only try disabling quiet mode
Change-Id: I20ae72a682796290796e724f26e2f36280de9ed0
Benjamin Franz [Fri, 15 Apr 2016 14:53:16 +0000 (14:53 +0000)]
Merge "Only try disabling quiet mode" into nyc-dev
Noah Wang [Fri, 15 Apr 2016 14:49:19 +0000 (14:49 +0000)]
Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug:
28025982" into nyc-dev
am:
87ec078
* commit '
87ec078dd5bb1801bb58189ccd2e11a771cb453a':
Change Preview Pager and Pager Indicator order for RTL environment Bug:
28025982
Change-Id: I83445e037451d4ab121d040ef9b2e63e1ba9be3d
Noah Wang [Fri, 15 Apr 2016 14:47:58 +0000 (14:47 +0000)]
Merge "Change Preview Pager and Pager Indicator order for RTL environment Bug:
28025982" into nyc-dev
Ricky Wai [Fri, 15 Apr 2016 14:42:46 +0000 (14:42 +0000)]
Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev
am:
697f3a6
* commit '
697f3a6ce21319d4e8f666633b4888fa8dfb0a50':
Show "work mode off" dialog when work notification setting is clicked
Change-Id: I3385090466d1a601e451bee0b166b784c12df2e8
Ricky Wai [Fri, 15 Apr 2016 14:40:11 +0000 (14:40 +0000)]
Merge "Show "work mode off" dialog when work notification setting is clicked" into nyc-dev
OSDN Git Service
