Commit Graph

27295 Commits

Author SHA1 Message Date
Sudheer Shanka
c779bece31 Apply policy transparency to "Stay awake" in Development settings.
Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
2016-04-19 22:49:45 -07:00
Sudheer Shanka
7e09747415 Fix summaries of some restricted switch preferences.
Bug: 27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65
2016-04-19 21:46:31 -07:00
Android Build Merger (Role)
5fafee9819 Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp 2016-04-20 00:14:19 +00:00
Daichi Hirono
f3d0b4af2f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
am: 4362396184

* commit '4362396184d0da37ad5d955f37dead01f6df5455':
  Add nullcheck to StorageSettings.

Change-Id: If0bac078c1d147c7d966fab8610e6a9fa629a0ae
2016-04-20 00:14:13 +00:00
Daichi Hirono
1a7aa2654f Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
am: ef5285e3f6

* commit 'ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
  Add nullcheck to StorageSettings.

Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47
2016-04-20 00:14:11 +00:00
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
4362396184 Merge "Add nullcheck to StorageSettings." into nyc-dev
am: 0e048a11c7

* commit '0e048a11c7a9567cf77fbef481a564833359369f':
  Add nullcheck to StorageSettings.

Change-Id: I749ecbe1ae8ce687ae9feca98a75539405b0a579
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
yifan.bai
198b92d037 resolve merge conflicts of 5213f71 to nyc-dev-plus-aosp
am: d2477357e8

* commit 'd2477357e86f453b8aef9e4255edf55625c5cd3d':
  Fix APN cannot save after ApnEditor is paused.

Change-Id: Ieb25454381616d68458e8416ffe933b77dcec9fd
2016-04-19 23:26:31 +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
Andrew Sapperstein
13792886a7 Create feature factory interface & initial impl.
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.

Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.

BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
(cherry picked from commit 867bb9c07a)
2016-04-19 23:01:49 +00:00
Amit Mahajan
052768a8b5 Merge "Fix APN cannot save after ApnEditor is paused." 2016-04-19 22:58:18 +00:00
Maurice Lam
fd03c3b366 [Fingerprint] Update strings
Update the label for the options in setup to match the flow model of
setup wizard.

Bug: 28219260
Change-Id: Ia975b5fc95c7c82c5ec23a2af5dcdcd9d69bb594
2016-04-19 14:24:17 -07:00
Udam Saini
29a04c05a5 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
am: 2620e24

* commit '2620e248f37da0135bbbb37294aba48a5c426f38':

Change-Id: I9fd5132af3b89cda76005e6cb85dc7ebdd49d10e
2016-04-19 20:57:38 +00:00
Udam Saini
a1acb6a9f8 Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
am: 3d2cba5

* commit '3d2cba56632ad05427dc058b8097c18ed954296e':
  Fix back button on fragments without help uris

Change-Id: I0141b385ff13002c9975b6d050753cec0ca87ff5
2016-04-19 20:54:14 +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
Johan Redestig
2620e248f3 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: I327abac867272c5900603d71d6e7ed4370dc0c48
2016-04-19 20:50:48 +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
TreeHugger Robot
63e39411ea Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
am: 9a22ccd

* commit '9a22ccde2f0fe216e59ebf512e2846ff26f0b753':

Change-Id: Iffe9ac9c0e0307bb86f5920c8b1df465ccf70bbe
2016-04-19 19:01:39 +00:00
TreeHugger Robot
51ea751ff5 Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
am: c838707

* commit 'c8387072eefd1871b34ac373f986c441b909b5bd':
  Fixed AccessPreference listener.

Change-Id: I00f43d6145d7de3cc5ee73a3a231f49dd951d922
2016-04-19 18:59:31 +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
Victor Chang
dc1f7d7584 Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
am: 063ae24

* commit '063ae24903e47e6a4c1192d480e1dffa33be39c0':

Change-Id: I836a949927d865feedc1cc6076357c2d6b84eb76
2016-04-19 18:46:26 +00:00
Felipe Leme
c8387072ee Merge "Fixed AccessPreference listener." into nyc-dev
am: 40c228d

* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
  Fixed AccessPreference listener.

Change-Id: Idca40034b476faf3be1a83a3e8cb224b8c3c8680
2016-04-19 18:45:51 +00:00
Victor Chang
ad8d93ce4f 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
2016-04-19 18:42:48 +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
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