Jim Miller
a2d94e9973
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
...
am: 25c0b7b
* commit '25c0b7bc4e12d6f0774695ca504118abba81ea88':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I1c7df2c60f898807a3e64fa714db4ff4675835fc
2016-04-20 21:42:23 +00:00
Jason Monk
b5c9e22777
Merge "Add minimum date" into nyc-dev
...
am: 17b554c
* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
Add minimum date
Change-Id: I537a109c7f7d2a3ff33f2cf9a9755060b2b6b640
2016-04-20 21:42:21 +00:00
Ruben Brunk
a72edfb23d
Merge "Add settings for altering VR display behavior." into nyc-dev
...
am: 3a3d110
* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
Add settings for altering VR display behavior.
Change-Id: I63640eedc5729ff34a388f2914e9c60ce7c715df
2016-04-20 21:42:20 +00:00
Sudheer Shanka
5a80da4bd1
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
2016-04-20 21:42:19 +00:00
Felipe Leme
3c62091511
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
2016-04-20 21:42:17 +00:00
Jason Monk
5ea44d0add
Merge "Fix sim status screen" into nyc-dev
...
am: e9dffcd
* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
Fix sim status screen
Change-Id: I56392c9e5319778d31942550497929618ad3338c
2016-04-20 21:42:16 +00:00
Jason Monk
c58b6b7e1a
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
2016-04-20 21:42:15 +00:00
Jim Miller
25c0b7bc4e
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
2016-04-20 21:33:13 +00:00
Jim Miller
5a8e522c6c
Fix bug where fingerprint for wrong userId was attempted to be removed.
...
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.
Fixes bug 28268635
Change-Id: Ic8abfbf6fbf173db2d57a76ac2e38b2a71ffd19e
2016-04-20 14:06:00 -07:00
Jason Monk
17b554c8b7
Merge "Add minimum date" into nyc-dev
2016-04-20 20:36:36 +00:00
Ruben Brunk
3a3d110a50
Merge "Add settings for altering VR display behavior." into nyc-dev
2016-04-20 19:51:50 +00:00
Ruben Brunk
e4d95c087b
Add settings for altering VR display behavior.
...
Bug=28208992
Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
2016-04-20 12:49:05 -07:00
Jason Monk
78f7b416c0
Add minimum date
...
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
2016-04-20 15:44:21 -04:00
Sudheer Shanka
b2f161ab38
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
2016-04-20 17:50:32 +00:00
TreeHugger Robot
4f5568a8a0
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
2016-04-20 17:44:55 +00:00
Jason Monk
e9dffcd34d
Merge "Fix sim status screen" into nyc-dev
2016-04-20 17:24:24 +00:00
Jason Monk
13d1c384e8
Fix sim status screen
...
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
2016-04-20 13:22:36 -04:00
Jason Monk
0bea8a9f48
Merge "Fix storage title clearing in multi-window" into nyc-dev
2016-04-20 17:08:29 +00:00
Jason Monk
f3446f98d5
Fix storage title clearing in multi-window
...
By accurately tracking detached state.
Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
2016-04-20 13:05:45 -04:00
Felipe Leme
85c63f348f
Listen to INetworkPolicyManager events and update UI accordingly.
...
BUG: 27481520
Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
2016-04-20 09:17:14 -07:00
Jason Monk
3f53bdb8a3
Merge "Potential fix for receiver leak problem" into nyc-dev
...
am: 623a289
* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
2016-04-20 13:59:42 +00:00
Jason Monk
623a289b9a
Merge "Potential fix for receiver leak problem" into nyc-dev
2016-04-20 13:49:32 +00:00
Clara Bayarri
38ee923a5e
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
2016-04-20 13:30:46 +00:00
Clara Bayarri
81c03dc32f
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
2016-04-20 13:24:43 +00:00
Clara Bayarri
cd6a2115c6
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
2016-04-20 11:51:52 +01:00
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
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
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