OSDN Git Service
Sudheer Shanka [Wed, 20 Apr 2016 22:20:34 +0000 (22:20 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39
am:
122b781
* commit '
122b781d3a7be39a53855d60f0cc0500d5ebbb1c':
Change-Id: I2e8b1ba4abb19e70e72d73304894c8ee48a78475
Sudheer Shanka [Wed, 20 Apr 2016 22:20:33 +0000 (22:20 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a
am:
5a80da4
* commit '
5a80da4bd102a2f5f7f04539d8c622be2479af26':
Change-Id: I2766a5a5b526ea3c19369daf0f2751f4e543c7e6
Jason Monk [Wed, 20 Apr 2016 22:20:32 +0000 (22:20 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc
am:
a60e5b5
* commit '
a60e5b52d8c0b800f6be86614dff3735013fd417':
Change-Id: Iba03018da665fc0eccab9ba13d6b5f4ba724719b
TreeHugger Robot [Wed, 20 Apr 2016 22:20:31 +0000 (22:20 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a
am:
3c62091
* commit '
3c620915118e06b2b1e5c418429584ceaa10152f':
Change-Id: I06a5fd0cbe88d8a36fd7c13e67c23547cbd21319
Jason Monk [Wed, 20 Apr 2016 22:20:29 +0000 (22:20 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd
am:
5ea44d0
* commit '
5ea44d0adde3876a69aecb1a87e4007b6bce143f':
Change-Id: I33ae907e60080094307acbbdfa99a9e36c048523
Jason Monk [Wed, 20 Apr 2016 22:20:27 +0000 (22:20 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9
am:
c58b6b7
* commit '
c58b6b7e1aca62e230cbf1e8e292d396b9857e08':
Change-Id: I3514b8edcf3a9a03095e726c04c70ba65f544848
Udam Saini [Wed, 20 Apr 2016 21:44:15 +0000 (21:44 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev am:
e0892e1
am:
be21812
* commit '
be218128276f3537d8afc1d4cced76adeb20a3d7':
Fixes a string for tablets/devices
Change-Id: I44a894f21aa0e490b93ff700129545cf13a999bc
Fan Zhang [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
am:
01f1779
* commit '
01f177982d1c38a9b85ddb2c22661a12081256a2':
Display setting and support in a tab layout - DO NOT MERGE
Change-Id: I43cd0b99d98bc7bda0aa751a56a7ac8ec03f28dc
TreeHugger Robot [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Remove some of the unused assets" into nyc-dev am:
8b8002b
am:
1a49ebc
* commit '
1a49ebc1af4abee5e08d7c798c966abd931c1677':
Remove some of the unused assets
Change-Id: Id8a0a645fabd3746e45bdcab43024141813dda92
Jason Monk [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Add minimum date" into nyc-dev am:
17b554c
am:
a0a1055
* commit '
a0a1055316a9d721c4439813b15af0b4c92d0e6e':
Add minimum date
Change-Id: I82ebfc3618156b163581ef20cf960c510fadcb16
Ruben Brunk [Wed, 20 Apr 2016 21:44:13 +0000 (21:44 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev am:
3a3d110
am:
0db43e4
* commit '
0db43e44d04854aec6c3d8902fe7a78b9047816c':
Add settings for altering VR display behavior.
Change-Id: I8c79191c9baf60258543ea5718a647012c720c51
Sudheer Shanka [Wed, 20 Apr 2016 21:44:12 +0000 (21:44 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39
am:
14aa458
* commit '
14aa458510294c67d2fabecb8058e76ad15ceefa':
Fix summaries of some restricted switch preferences.
Change-Id: Idec83fbfa710c27d961d406f366285a47c8cf5a0
Sudheer Shanka [Wed, 20 Apr 2016 21:44:10 +0000 (21:44 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a
am:
c80d630
* commit '
c80d6305592052c91a86d68aede04cbd226c4d9e':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: Id96188a427f4ff0d306e4f77e8ee600624cee8fa
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
Sudheer Shanka [Wed, 20 Apr 2016 21:42:20 +0000 (21:42 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
am:
c2dae39
* commit '
c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
Fix summaries of some restricted switch preferences.
Change-Id: If7fb847fb1a995d92519ec223492cee6711ec46a
Sudheer Shanka [Wed, 20 Apr 2016 21:42:19 +0000 (21:42 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
am:
b2f161a
* commit '
b2f161ab389469c7029efe4915aef06e9671ffdb':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: Ifa4602bf64c12d47030e71068c80733bf6d88bfa
Jason Monk [Wed, 20 Apr 2016 21:42:18 +0000 (21:42 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev
am:
ea80ebc
* commit '
ea80ebcd92c94d99f22279101ee2bdc27499b55b':
Daydream -> Screen saver
Change-Id: Ia6454ece816ef711261094fceab046563c723514
Felipe Leme [Wed, 20 Apr 2016 21:42:17 +0000 (21:42 +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: I2aad2e45e53b910efb6b1c684708db0c44ace65a
Jason Monk [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]
Merge "Fix sim status screen" into nyc-dev
am:
e9dffcd
* commit '
e9dffcd34df3b1919f3843e0c0013fb793699e3f':
Fix sim status screen
Change-Id: I56392c9e5319778d31942550497929618ad3338c
Jason Monk [Wed, 20 Apr 2016 21:42:15 +0000 (21:42 +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: Ief2ca68ee3b7563e77091db09eb455c387158b41
Udam Saini [Wed, 20 Apr 2016 21:04:30 +0000 (21:04 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev
am:
e0892e1
* commit '
e0892e16adb55e3f0b368b9d461efae09bf38c5b':
Fixes a string for tablets/devices
Change-Id: Ia183de4fa9330a6e89bb53d2f16d5a0a8f286456
Udam Saini [Wed, 20 Apr 2016 20:54:41 +0000 (20:54 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev
Fan Zhang [Wed, 20 Apr 2016 20:50:15 +0000 (20:50 +0000)]
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
Jason Monk [Wed, 20 Apr 2016 20:48:42 +0000 (20:48 +0000)]
Merge "Remove some of the unused assets" into nyc-dev
am:
8b8002b
* commit '
8b8002b50831e8c93df0f04e2e6605719585b985':
Remove some of the unused assets
Change-Id: Ib957eafa08cfb05c14ee9e87e9f86d9895f606aa
Jason Monk [Wed, 20 Apr 2016 20:48:42 +0000 (20:48 +0000)]
Merge "Add minimum date" into nyc-dev
am:
17b554c
* commit '
17b554c8b7b05b6c31b1aba15ea2067c50d08153':
Add minimum date
Change-Id: I12809498e61faa81775d7ba97d358db779c0a14b
TreeHugger Robot [Wed, 20 Apr 2016 20:42:55 +0000 (20:42 +0000)]
Merge "Remove some of the unused assets" into nyc-dev
Jason Monk [Wed, 20 Apr 2016 20:36:36 +0000 (20:36 +0000)]
Merge "Add minimum date" into nyc-dev
Ruben Brunk [Wed, 20 Apr 2016 20:04:03 +0000 (20:04 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
am:
3a3d110
* commit '
3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
Add settings for altering VR display behavior.
Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
Ruben Brunk [Wed, 20 Apr 2016 19:51:49 +0000 (19:51 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev
Ruben Brunk [Tue, 19 Apr 2016 01:08:34 +0000 (18:08 -0700)]
Add settings for altering VR display behavior.
Bug=
28208992
Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
Jason Monk [Wed, 20 Apr 2016 19:44:21 +0000 (15:44 -0400)]
Add minimum date
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes:
26346842
Jason Monk [Wed, 20 Apr 2016 19:10:08 +0000 (15:10 -0400)]
Remove some of the unused assets
Probably didn't get them all, but this is good enough for now.
Change-Id: I86637d7ae1e31ba9cd625589fa1e4ded32cca4b3
Fixes:
27816752
Fan Zhang [Wed, 23 Mar 2016 22:31:08 +0000 (15:31 -0700)]
Display setting and support in a tab layout - DO NOT MERGE
Bug:
28269035
Bug:
28139604
Udam Saini [Wed, 20 Apr 2016 18:27:02 +0000 (11:27 -0700)]
Fixes a string for tablets/devices
Had accidentally always set this to phone.
bug:
28293197
Change-Id: I926e4c9681f2e7e660bdc2664256c8a7ea6e7951
Sudheer Shanka [Wed, 20 Apr 2016 18:16:26 +0000 (18:16 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
am:
c2dae39
* commit '
c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
Fix summaries of some restricted switch preferences.
Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
Sudheer Shanka [Wed, 20 Apr 2016 18:04:12 +0000 (18:04 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
Sudheer Shanka [Wed, 20 Apr 2016 18:02:35 +0000 (18:02 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
am:
b2f161a
* commit '
b2f161ab389469c7029efe4915aef06e9671ffdb':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: I22816dad3b6a96d36062f395847eec36db205363
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
Sudheer Shanka [Wed, 20 Apr 2016 17:50:32 +0000 (17:50 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
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
Sudheer Shanka [Wed, 20 Apr 2016 05:48:26 +0000 (22:48 -0700)]
Apply policy transparency to "Stay awake" in Development settings.
Bug:
28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
Sudheer Shanka [Wed, 20 Apr 2016 04:46:31 +0000 (21:46 -0700)]
Fix summaries of some restricted switch preferences.
Bug:
27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65
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
OSDN Git Service
