Victor Chang
f766cc8395
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
2016-04-19 18:39:11 +00:00
Jason Monk
3bd5600360
Merge "Fix account screen in split screen" into nyc-dev am: 43059b7
...
am: 7e62eef
* commit '7e62eef4eff6b25f146cacd584355678f11f8b99':
Change-Id: Ibd3440f753cab510c7db9b506b4fbc5e43828e67
2016-04-19 18:31:38 +00:00
Jason Monk
50d03f4f65
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
2016-04-19 18:29:40 +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
7e62eef4ef
Merge "Fix account screen in split screen" into nyc-dev
...
am: 43059b7
* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: I7e422356106307ef827f04a2147a7978bd6d81d6
2016-04-19 18:22:21 +00:00
Noah Wang
ff380b9841
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
2016-04-19 18:14:24 +00:00
Noah Wang
0b420fdad1
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
2016-04-19 18:11:09 +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
Noah Wang
9359e0f969
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
2016-04-19 18:07:08 +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
Mihai Nita
d86cba770d
Settings: change the TTS text to use the current locale
...
Google TTS currently does not support language auto-switching.
Also, not all languages are available in TTS at all times.
This means that TTS cannot properly handle text in other languages / scripts
than the current language.
Languages with different scripts would not be read at all, and the others
would be read with "bad pronunciation", to the point of being unrecognizable.
This change is not a full fix, but makes things slightly better by using
the default locale for the contentDescription in the language / region lists.
This might be a bit unsettling, as the label will not match the sound.
The label will show "Deutsch" or "Русский" and text-to-speech will say "German"
or "Russian" (for English UI), or "Allemand" or "Russe" (if the UI is French).
Might also say nothing, if the current UI language has no text-to-speech engine.
But this is the best we can do, and better that what we get if we do nothing.
Bug: 28087937
Change-Id: I54d49ec96a10bab3e31198e162230fb277426e66
2016-04-19 09:25:58 -07:00
Android Build Merger (Role)
647e70f5c1
Merge "Merge "Guard against app info crash" into nyc-dev am: c3ab03e
am: 9f6fcdf" into nyc-mr1-dev-plus-aosp
2016-04-19 13:51:11 +00:00
Jason Monk
5d124ea344
Merge "Guard against app info crash" into nyc-dev am: c3ab03e
...
am: 9f6fcdf
* commit '9f6fcdf0d7cda838a9072f7c912fd5a5b6bb5129':
Guard against app info crash
Change-Id: Iac16ff08c6fe12acbce8cb9ccf0401fcf2722690
2016-04-19 13:51:02 +00:00
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
9f6fcdf0d7
Merge "Guard against app info crash" into nyc-dev
...
am: c3ab03e
* commit 'c3ab03ecdb505114770cbb87b61457fabf75847f':
Guard against app info crash
Change-Id: I313465d83efc950527b1634e2bc6609e6ea8e7cf
2016-04-19 13:45:18 +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
Daichi Hirono
3ae25fb520
Add nullcheck to StorageSettings.
...
Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes: 28255655
2016-04-19 19:39:42 +09: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
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
Jason Monk
8ab081e304
Potential fix for receiver leak problem
...
The background thread is not stopping listening fast enough and is
resulting in first a receiver leak message followed by a crash when
trying to finally unregister the receiver.
Fix this by adding a registerReceiver to SummaryLoader that will
automatically unregister the receiver on the main thread to ensure
it happens in time.
Change-Id: I0104e929d5505eb53993f6765e4c90120df35cf6
Fixes: 28211606
2016-04-18 15:30:42 -04:00