Daichi Hirono
ef5285e3f6
Merge "Add nullcheck to StorageSettings." into nyc-dev
...
am: 0e048a11c7
* commit '0e048a11c7a9567cf77fbef481a564833359369f':
Add nullcheck to StorageSettings.
Change-Id: I58982903534d2dce24bd453bc72617a607373684
2016-04-20 00:12:03 +00:00
Daichi Hirono
0e048a11c7
Merge "Add nullcheck to StorageSettings." into nyc-dev
2016-04-20 00:04:11 +00:00
Amit Mahajan
d2477357e8
resolve merge conflicts of 5213f71
to nyc-dev-plus-aosp
...
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
2016-04-19 16:15:56 -07:00
yifan.bai
5213f71536
Merge "Fix APN cannot save after ApnEditor is paused."
...
am: 052768a8b5
* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
Fix APN cannot save after ApnEditor is paused.
Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
2016-04-19 23:06:49 +00:00
Amit Mahajan
052768a8b5
Merge "Fix APN cannot save after ApnEditor is paused."
2016-04-19 22:58:18 +00:00
Johan Redestig
3d2cba5663
Merge "Fix back button on fragments without help uris" into nyc-dev
...
am: ed74511
* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
Fix back button on fragments without help uris
Change-Id: Iea98f27e3784bb34fd4a272f2c450a5704e6555d
2016-04-19 20:51:10 +00:00
Udam Saini
ed74511cb1
Merge "Fix back button on fragments without help uris" into nyc-dev
2016-04-19 20:39:29 +00:00
Felipe Leme
9a22ccde2f
Merge "Fixed AccessPreference listener." into nyc-dev
...
am: 40c228d
* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
Fixed AccessPreference listener.
Change-Id: I7f47a8a2ce57e3cb17aef915b9430c1be5b0da15
2016-04-19 18:59:26 +00:00
TreeHugger Robot
40c228d989
Merge "Fixed AccessPreference listener." into nyc-dev
2016-04-19 18:41:06 +00:00
Victor Chang
063ae24903
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: I4d4677536be0f30e0c46cd191fa6f9eea518960b
2016-04-19 18:39:19 +00:00
Victor Chang
04a01b7cc7
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
2016-04-19 18:29:16 +00:00
Jason Monk
4619c9cf4a
Merge "Fix account screen in split screen" into nyc-dev
...
am: 43059b7
* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
2016-04-19 18:22:29 +00:00
Jason Monk
43059b7e7c
Merge "Fix account screen in split screen" into nyc-dev
2016-04-19 18:09:27 +00:00
Noah Wang
1c94e6dd90
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
2016-04-19 18:07:20 +00:00
Jason Monk
74bd0c87be
Fix account screen in split screen
...
Don't remove all prefs in on pause, because why would you...
Change-Id: I9139dabf917b05860e738dc0b2aa19df8f983a7e
Fixes: 27987782
2016-04-19 14:06:24 -04:00
Noah Wang
4f63bb69f5
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
2016-04-19 17:56:50 +00:00
Johan Redestig
76218e54ae
Fix back button on fragments without help uris
...
This is a follow up to 0708d9e119
. The setHasOptionsMenu has
to be set for the back button to work and this needs to happen
regardles if the fragment has an help uri or not.
Bug: 28237921
Change-Id: Icec7a94312bdab5470efa0893a339d753c995eb1
2016-04-19 10:26:04 -07:00
Felipe Leme
11b06ca8bf
Fixed AccessPreference listener.
...
When an app is blacklisted, its switch toggle is disabled, but previous
the onClick() method was still being called, which would launch the data
usage screen but also call setIsWhitelist().
BUG: 27481520
Change-Id: Id8df3d65eee286d1aecb4ae2a0417d6932d91441
2016-04-19 10:05:08 -07:00
Victor Chang
e8a46f2838
Remove reference to @string/ssl_ca_cert_dialog_title
...
Bug: 28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b
2016-04-19 17:47:58 +01: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
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
295f1060e9
Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
2016-04-19 13:25:22 +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
8aa7cf1631
Merge "Input Settings: Change the 'add' icon." into nyc-dev
2016-04-19 10:56:35 +00:00
Daichi Hirono
3ae25fb520
Add nullcheck to StorageSettings.
...
Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes: 28255655
2016-04-19 19:39:42 +09: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
23f7dab2b6
Merge "Fix: SpellChecker subtype label cannot be updated." into nyc-dev
2016-04-19 04:17:02 +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
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
Noah Wang
35a95617fd
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
2016-04-18 13:08:56 -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
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
bd068163e3
Merge "Use IME service logo or icon if exists." into nyc-dev
2016-04-18 19:01:28 +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
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
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
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
Shweta Chahar
da4ecea845
Merge "Add a button to reset pitch to default value." into nyc-dev
2016-04-18 15:14:24 +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
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
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