OSDN Git Service
Jason Monk [Wed, 20 Apr 2016 21:44:08 +0000 (21:44 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc
am:
040acf7
* commit '
040acf7dabbcc9a5673755e86e765298d381ff1d':
Daydream -> Screen saver
Change-Id: I5ab92bba5acb4d71118047f3fa5c04593cd8136a
TreeHugger Robot [Wed, 20 Apr 2016 21:44:06 +0000 (21:44 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a
am:
4d1954f
* commit '
4d1954f71faf34f7995702cdd9fb3a5e1342841c':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: I5c7b5c9d937af9da035fbef54eab75b70ef16b8a
Jason Monk [Wed, 20 Apr 2016 21:44:05 +0000 (21:44 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd
am:
18bf2fb
* commit '
18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
Fix sim status screen
Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
Jason Monk [Wed, 20 Apr 2016 21:44:02 +0000 (21:44 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9
am:
018d99c
* commit '
018d99cd288622bc4daf37b969e3340441bcb28d':
Fix storage title clearing in multi-window
Change-Id: I0e1f19ca14989df82c65adbb0612dcc97370f27b
Andrew Sapperstein [Wed, 20 Apr 2016 21:44:01 +0000 (21:44 +0000)]
Remove ToastController.
am:
1d1a269
* commit '
1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
Remove ToastController.
Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
Andrew Sapperstein [Wed, 20 Apr 2016 21:43:58 +0000 (21:43 +0000)]
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
am:
12344c5
* commit '
12344c5ff5be19e9f610df033b2cdf529cd13d76':
Create feature factory interface & initial impl.
Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
Jason Monk [Wed, 20 Apr 2016 17:56:04 +0000 (17:56 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev
am:
ea80ebc
* commit '
ea80ebcd92c94d99f22279101ee2bdc27499b55b':
Daydream -> Screen saver
Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
Felipe Leme [Wed, 20 Apr 2016 17:56:04 +0000 (17:56 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
am:
4f5568a
* commit '
4f5568a8a0cd69968ae0a5278bb06ea8adc9414f':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: Iba51d696311d4ddafb34b0e21341ad63239ab89d
Jason Monk [Wed, 20 Apr 2016 17:49:02 +0000 (17:49 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 17:44:54 +0000 (17:44 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:39:18 +0000 (13:39 -0400)]
Daydream -> Screen saver
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes:
28268243
Jason Monk [Wed, 20 Apr 2016 17:32:39 +0000 (17:32 +0000)]
Merge "Fix sim status screen" into nyc-dev
am:
e9dffcd
* commit '
e9dffcd34df3b1919f3843e0c0013fb793699e3f':
Fix sim status screen
Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
Jason Monk [Wed, 20 Apr 2016 17:24:24 +0000 (17:24 +0000)]
Merge "Fix sim status screen" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:22:36 +0000 (13:22 -0400)]
Fix sim status screen
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes:
27963774
Jason Monk [Wed, 20 Apr 2016 17:19:11 +0000 (17:19 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev
am:
0bea8a9
* commit '
0bea8a9f48eabefbd41484ffa19ec21637150a2c':
Fix storage title clearing in multi-window
Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
Jason Monk [Wed, 20 Apr 2016 17:08:28 +0000 (17:08 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 17:05:45 +0000 (13:05 -0400)]
Fix storage title clearing in multi-window
By accurately tracking detached state.
Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes:
27989238
Andrew Sapperstein [Thu, 14 Apr 2016 22:11:33 +0000 (15:11 -0700)]
Remove ToastController.
Wasn't meant to be submitted.
Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit
17047d19396b9c01dd7d3daf92ef327f1eafc650)
Andrew Sapperstein [Wed, 20 Apr 2016 16:53:02 +0000 (16:53 +0000)]
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
Felipe Leme [Tue, 19 Apr 2016 17:00:20 +0000 (10:00 -0700)]
Listen to INetworkPolicyManager events and update UI accordingly.
BUG:
27481520
Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
Android Build Merger (Role) [Wed, 20 Apr 2016 14:02:25 +0000 (14:02 +0000)]
Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am:
623a289 am:
3f53bdb" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 20 Apr 2016 14:02:16 +0000 (14:02 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev am:
623a289
am:
523f522
* commit '
523f5228d44cb0a5670fe085bb13ed4217e4e027':
Potential fix for receiver leak problem
Change-Id: If393c4b4d814aab5f1eb4e0b08c2e5ac1b88bba1
Jason Monk [Wed, 20 Apr 2016 14:02:15 +0000 (14:02 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev am:
623a289
am:
3f53bdb
* commit '
3f53bdb8a32f6da6c77ce4ceae7c4b19cf095ef2':
Potential fix for receiver leak problem
Change-Id: I462601739977f6c3d50d0460df4bb82daeeae865
Jason Monk [Wed, 20 Apr 2016 13:59:42 +0000 (13:59 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev
am:
623a289
* commit '
623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
Jason Monk [Wed, 20 Apr 2016 13:59:15 +0000 (13:59 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev
am:
623a289
* commit '
623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: Id8f248da03867074561ce3c34cff80ffcb84ad93
Jason Monk [Wed, 20 Apr 2016 13:49:32 +0000 (13:49 +0000)]
Merge "Potential fix for receiver leak problem" into nyc-dev
Android Build Merger (Role) [Wed, 20 Apr 2016 13:34:12 +0000 (13:34 +0000)]
Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am:
81c03dc am:
6a782d9" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Wed, 20 Apr 2016 13:34:03 +0000 (13:34 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am:
81c03dc
am:
6a782d9
* commit '
6a782d925f456209de47569fd7308e43a94a7f94':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc
Clara Bayarri [Wed, 20 Apr 2016 13:34:02 +0000 (13:34 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am:
81c03dc
am:
38ee923
* commit '
38ee923a5e97e87e5e1135ac3b8d588d90e0c446':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I519a294015346595bf20d35ab35fb5c5663e58d6
Clara Bayarri [Wed, 20 Apr 2016 13:30:46 +0000 (13:30 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am:
81c03dc
* commit '
81c03dc32f723f1489c48640eb27fb40c0b47f0c':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63
Clara Bayarri [Wed, 20 Apr 2016 13:30:45 +0000 (13:30 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
am:
81c03dc
* commit '
81c03dc32f723f1489c48640eb27fb40c0b47f0c':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I336ea364687f696ea90c3261c843447175f00d26
Clara Bayarri [Wed, 20 Apr 2016 13:24:43 +0000 (13:24 +0000)]
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
Clara Bayarri [Wed, 20 Apr 2016 10:29:04 +0000 (11:29 +0100)]
Fix Developer options appears after first boot, disappers on Settings Menu Reload
The Tiles are updated to disabled via PackageManager, which takes a few
seconds to kick in and hence the user sees the option appear and then
disappear. Making Developer Options disabled by default fixes the flash.
Note now the opposite happens, on eng builds where Developer Settings
are on by default they will not appear until the PackageManager update
has cleared.
Bug:
28121698
Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551
Android Build Merger (Role) [Wed, 20 Apr 2016 00:14:19 +0000 (00:14 +0000)]
Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am:
0e048a11c7 am:
4362396184" into nyc-mr1-dev-plus-aosp
Daichi Hirono [Wed, 20 Apr 2016 00:14:13 +0000 (00:14 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev am:
0e048a11c7
am:
4362396184
* commit '
4362396184d0da37ad5d955f37dead01f6df5455':
Add nullcheck to StorageSettings.
Change-Id: If0bac078c1d147c7d966fab8610e6a9fa629a0ae
Daichi Hirono [Wed, 20 Apr 2016 00:14:11 +0000 (00:14 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev am:
0e048a11c7
am:
ef5285e3f6
* commit '
ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
Add nullcheck to StorageSettings.
Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47
Daichi Hirono [Wed, 20 Apr 2016 00:12:03 +0000 (00:12 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev
am:
0e048a11c7
* commit '
0e048a11c7a9567cf77fbef481a564833359369f':
Add nullcheck to StorageSettings.
Change-Id: I58982903534d2dce24bd453bc72617a607373684
Daichi Hirono [Wed, 20 Apr 2016 00:12:03 +0000 (00:12 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev
am:
0e048a11c7
* commit '
0e048a11c7a9567cf77fbef481a564833359369f':
Add nullcheck to StorageSettings.
Change-Id: I749ecbe1ae8ce687ae9feca98a75539405b0a579
Daichi Hirono [Wed, 20 Apr 2016 00:04:11 +0000 (00:04 +0000)]
Merge "Add nullcheck to StorageSettings." into nyc-dev
yifan.bai [Tue, 19 Apr 2016 23:26:31 +0000 (23:26 +0000)]
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
Amit Mahajan [Tue, 19 Apr 2016 23:15:56 +0000 (16:15 -0700)]
resolve merge conflicts of
5213f71 to nyc-dev-plus-aosp
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
yifan.bai [Tue, 19 Apr 2016 23:06:49 +0000 (23:06 +0000)]
Merge "Fix APN cannot save after ApnEditor is paused."
am:
052768a8b5
* commit '
052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
Fix APN cannot save after ApnEditor is paused.
Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
Andrew Sapperstein [Mon, 11 Apr 2016 20:58:07 +0000 (13:58 -0700)]
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
867bb9c07ab332fd9be67d1eeee3db796d9e0ffa)
Amit Mahajan [Tue, 19 Apr 2016 22:58:18 +0000 (22:58 +0000)]
Merge "Fix APN cannot save after ApnEditor is paused."
Udam Saini [Tue, 19 Apr 2016 20:57:38 +0000 (20:57 +0000)]
Merge "Fix back button on fragments without help uris" into nyc-dev am:
ed74511
am:
2620e24
* commit '
2620e248f37da0135bbbb37294aba48a5c426f38':
Change-Id: I9fd5132af3b89cda76005e6cb85dc7ebdd49d10e
Udam Saini [Tue, 19 Apr 2016 20:54:14 +0000 (20:54 +0000)]
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
Johan Redestig [Tue, 19 Apr 2016 20:51:10 +0000 (20:51 +0000)]
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
Johan Redestig [Tue, 19 Apr 2016 20:50:48 +0000 (20:50 +0000)]
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
Udam Saini [Tue, 19 Apr 2016 20:39:29 +0000 (20:39 +0000)]
Merge "Fix back button on fragments without help uris" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 19:01:39 +0000 (19:01 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev am:
40c228d
am:
9a22ccd
* commit '
9a22ccde2f0fe216e59ebf512e2846ff26f0b753':
Change-Id: Iffe9ac9c0e0307bb86f5920c8b1df465ccf70bbe
TreeHugger Robot [Tue, 19 Apr 2016 18:59:31 +0000 (18:59 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev am:
40c228d
am:
c838707
* commit '
c8387072eefd1871b34ac373f986c441b909b5bd':
Fixed AccessPreference listener.
Change-Id: I00f43d6145d7de3cc5ee73a3a231f49dd951d922
Felipe Leme [Tue, 19 Apr 2016 18:59:26 +0000 (18:59 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev
am:
40c228d
* commit '
40c228d989c19eb69f5efe258cf7d24cf86e93ba':
Fixed AccessPreference listener.
Change-Id: I7f47a8a2ce57e3cb17aef915b9430c1be5b0da15
Victor Chang [Tue, 19 Apr 2016 18:46:26 +0000 (18:46 +0000)]
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am:
04a01b7
am:
063ae24
* commit '
063ae24903e47e6a4c1192d480e1dffa33be39c0':
Change-Id: I836a949927d865feedc1cc6076357c2d6b84eb76
Felipe Leme [Tue, 19 Apr 2016 18:45:51 +0000 (18:45 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev
am:
40c228d
* commit '
40c228d989c19eb69f5efe258cf7d24cf86e93ba':
Fixed AccessPreference listener.
Change-Id: Idca40034b476faf3be1a83a3e8cb224b8c3c8680
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
TreeHugger Robot [Tue, 19 Apr 2016 18:41:06 +0000 (18:41 +0000)]
Merge "Fixed AccessPreference listener." into nyc-dev
Victor Chang [Tue, 19 Apr 2016 18:39:19 +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: I4d4677536be0f30e0c46cd191fa6f9eea518960b
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
Johan Redestig [Tue, 19 Apr 2016 06:29:30 +0000 (08:29 +0200)]
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
Felipe Leme [Tue, 19 Apr 2016 17:05:08 +0000 (10:05 -0700)]
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
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
Daichi Hirono [Tue, 19 Apr 2016 10:39:42 +0000 (19:39 +0900)]
Add nullcheck to StorageSettings.
Change-Id: I6e3e00557c2086a265d399ea7d060d07befebdf7
Fixes:
28255655
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
OSDN Git Service
